Initial branch rule implementation

Re-add starter templates
Update console and templates
2026-05-26 13:51:13 +00:00 · 2025-02-15 04:40:32 +01:00 · 2025-02-15 00:34:43 +01:00 · 2025-02-14 21:42:39 +01:00 · 2025-02-14 12:40:37 +01:00 · 2025-02-14 12:05:21 +01:00
319 changed files with 28520 additions and 10577 deletions
@@ -18,10 +18,11 @@ _APP_SYSTEM_RESPONSE_FORMAT=
 _APP_OPTIONS_ABUSE=disabled
 _APP_OPTIONS_ROUTER_PROTECTION=disabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
-_APP_OPTIONS_FUNCTIONS_FORCE_HTTPS=disabled
+_APP_OPTIONS_COMPUTE_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=localhost
 _APP_RULES_FORMAT=md5
 _APP_REDIS_HOST=redis
@@ -39,7 +40,6 @@ _APP_STORAGE_S3_ACCESS_KEY=
 _APP_STORAGE_S3_SECRET=
 _APP_STORAGE_S3_REGION=us-east-1
 _APP_STORAGE_S3_BUCKET=
-_APP_STORAGE_S3_ENDPOINT=
 _APP_STORAGE_DO_SPACES_ACCESS_KEY=
 _APP_STORAGE_DO_SPACES_SECRET=
 _APP_STORAGE_DO_SPACES_REGION=us-east-1
@@ -69,26 +69,26 @@ _APP_SMS_FROM=+123456789
 _APP_SMS_PROJECTS_DENY_LIST=
 _APP_STORAGE_LIMIT=30000000
 _APP_STORAGE_PREVIEW_LIMIT=20000000
-_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_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_EXECUTOR_SECRET=your-secret-key
-_APP_EXECUTOR_HOST=http://proxy/v1
+_APP_EXECUTOR_HOST=http://exc1/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 # TODO: Angular
 _APP_MAINTENANCE_INTERVAL=86400
 _APP_MAINTENANCE_DELAY=
 _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
 _APP_MAINTENANCE_RETENTION_AUDIT=1209600
-_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE=15778800
 _APP_USAGE_AGGREGATION_INTERVAL=30
-_APP_STATS_RESOURCES_INTERVAL=3600
 _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
 _APP_MAINTENANCE_RETENTION_SCHEDULES=86400
 _APP_USAGE_STATS=enabled
@@ -113,4 +113,3 @@ _APP_MESSAGE_PUSH_TEST_DSN=
 _APP_WEBHOOK_MAX_FAILED_ATTEMPTS=10
 _APP_PROJECT_REGIONS=default
 _APP_FUNCTIONS_CREATION_ABUSE_LIMIT=5000
-_APP_STATS_USAGE_DUAL_WRITING_DBS=database_db_main
@@ -13,13 +13,8 @@ on:
  schedule:
    - cron: '0 16 * * 0'

-permissions:
-  contents: read
-
 jobs:
  analyze:
-    permissions:
-      security-events: write
    name: Analyze
    runs-on: ubuntu-latest

@@ -26,7 +26,7 @@ jobs:
    - name: Login to Docker Hub
      uses: docker/login-action@v2
      with:
-        username: ${{ vars.DOCKERHUB_USERNAME }}
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
        password: ${{ secrets.DOCKERHUB_TOKEN }}

    - name: Extract metadata (tags, labels) for Docker
@@ -28,7 +28,7 @@ jobs:
    - name: Login to Docker Hub
      uses: docker/login-action@v2
      with:
-        username: ${{ vars.DOCKERHUB_USERNAME }}
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
        password: ${{ secrets.DOCKERHUB_TOKEN }}

    - name: Extract metadata (tags, labels) for Docker
@@ -0,0 +1,16 @@
+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"
@@ -8,33 +8,9 @@ env:
  IMAGE: appwrite-dev
  CACHE_KEY: appwrite-dev-${{ github.event.pull_request.head.sha }}

-on: [ pull_request ]
+on: [pull_request]

 jobs:
-  check_database_changes:
-    name: Check if utopia-php/database changed
-    runs-on: ubuntu-latest
-    outputs:
-      database_changed: ${{ steps.check.outputs.database_changed }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Fetch base branch
-        run: git fetch origin ${{ github.event.pull_request.base.ref }}
-
-      - name: Check for utopia-php/database changes
-        id: check
-        run: |
-          if git diff origin/${{ github.event.pull_request.base.ref }} HEAD -- composer.lock | grep -q '"name": "utopia-php/database"'; then
-            echo "Database version changed, going to run all mode tests."
-            echo "database_changed=true" >> "$GITHUB_ENV"
-            echo "database_changed=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "database_changed=false" >> "$GITHUB_ENV"
-            echo "database_changed=false" >> "$GITHUB_OUTPUT"
-          fi
-
  setup:
    name: Setup & Build Appwrite Image
    runs-on: ubuntu-latest
@@ -90,6 +66,9 @@ jobs:
          docker compose up -d
          sleep 10

+      - name: Logs
+        run: docker compose logs appwrite
+
      - name: Doctor
        run: docker compose exec -T appwrite doctor

@@ -127,62 +106,6 @@ jobs:
    name: E2E Service Test
    runs-on: ubuntu-latest
    needs: setup
-    strategy:
-      fail-fast: false
-      matrix:
-        service: [
-          Account,
-          Avatars,
-          Console,
-          Databases,
-          Functions,
-          FunctionsSchedule,
-          GraphQL,
-          Health,
-          Locale,
-          Projects,
-          Realtime,
-          Storage,
-          Teams,
-          Users,
-          Webhooks,
-          VCS,
-          Messaging,
-          Migrations
-        ]
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Load Cache
-        uses: actions/cache@v4
-        with:
-          key: ${{ env.CACHE_KEY }}
-          path: /tmp/${{ env.IMAGE }}.tar
-          fail-on-cache-miss: true
-
-      - name: Load and Start Appwrite
-        run: |
-          docker load --input /tmp/${{ env.IMAGE }}.tar
-          docker compose up -d
-          sleep 30
-
-      - name: Run ${{ matrix.service }} tests with Project table mode
-        run: |
-          echo "Using project tables"
-          export _APP_DATABASE_SHARED_TABLES=
-          export _APP_DATABASE_SHARED_TABLES_V1=
-
-          docker compose exec -T \
-            -e _APP_DATABASE_SHARED_TABLES \
-            -e _APP_DATABASE_SHARED_TABLES_V1 \
-            appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug
-
-  e2e_shared_mode_test:
-    name: E2E Shared Mode Service Test
-    runs-on: ubuntu-latest
-    needs: [ setup, check_database_changes ]
-    if: needs.check_database_changes.outputs.database_changed == 'true'
    strategy:
      fail-fast: false
      matrix:
@@ -199,6 +122,7 @@ jobs:
            Locale,
            Projects,
            Realtime,
+            Sites,
            Storage,
            Teams,
            Users,
@@ -208,6 +132,7 @@ jobs:
            Migrations
          ]
        tables-mode: [
+          'Project',
          'Shared V1',
          'Shared V2',
        ]
@@ -227,7 +152,7 @@ jobs:
        run: |
          docker load --input /tmp/${{ env.IMAGE }}.tar
          docker compose up -d
-          sleep 30
+          sleep 60

      - name: Run ${{ matrix.service }} tests with ${{ matrix.tables-mode }} table mode
        run: |
@@ -239,8 +164,15 @@ jobs:
            echo "Using shared tables V2"
            export _APP_DATABASE_SHARED_TABLES=database_db_main
            export _APP_DATABASE_SHARED_TABLES_V1=
+          else
+            echo "Using project tables"
+            export _APP_DATABASE_SHARED_TABLES=
+            export _APP_DATABASE_SHARED_TABLES_V1=
          fi
-          
+
+          echo 'Sleep 1 minute, as temporary fix for v4rc executor startup (image pulling)'
+          sleep 60
+      
          docker compose exec -T \
            -e _APP_DATABASE_SHARED_TABLES \
            -e _APP_DATABASE_SHARED_TABLES_V1 \
@@ -326,4 +258,4 @@ jobs:
          comment-id: ${{ steps.fc.outputs.comment-id }}
          issue-number: ${{ github.event.pull_request.number }}
          body-path: benchmark.txt
-          edit-mode: replace
+          edit-mode: replace
@@ -3,6 +3,7 @@
 /node_modules/
 /tests/resources/storage/
 /tests/resources/functions/**/code.tar.gz
+/tests/resources/sites/**/code.tar.gz
 /app/sdks/*
 /.idea/
 !/.idea/workspace.xml
@@ -1,6 +1,6 @@
 # Contributing

-We would :heart: you to contribute to Appwrite and help make it better! We want contributing to Appwrite to be fun, enjoyable, and educational for anyone and everyone. All contributions are welcome, including issues, and new docs, as well as updates and tweaks, blog posts, workshops, and more.
+We would ❤️ you to contribute to Appwrite and help make it better! We want contributing to Appwrite to be fun, enjoyable, and educational for anyone and everyone. All contributions are welcome, including issues, and new docs, as well as updates and tweaks, blog posts, workshops, and more.

 ## Here for Hacktoberfest?
 If you're here to contribute during Hacktoberfest, we're so happy to see you here. Appwrite has been a long-time participant of Hacktoberfest and we welcome you, whatever your experience level. This year, we're **only taking contributions for issues tagged** `hacktoberfest`, so we can focus our resources to support your contributions.
@@ -9,13 +9,13 @@ You can [find issues using this query](https://github.com/search?q=org%3Aappwrit

 ## How to Start?

-If you are worried or don’t know where to start, check out the next section that explains what kind of help we could use and where you can get involved. You can send your questions to [@appwrite on Twitter](https://twitter.com/appwrite) or to anyone from the [Appwrite team on Discord](https://appwrite.io/discord). You can also submit an issue, and a maintainer can guide you!
+If you are worried or don’t know where to start, check out the next section that explains what kind of help we could use and where you can get involved. You can send your questions to [@appwrite](https://twitter.com/appwrite) on Twitter or to anyone from the [Appwrite team on Discord](https://appwrite.io/discord). You can also submit an issue, and a maintainer can guide you!

 ## Code of Conduct

 Help us keep Appwrite open and inclusive. Please read and follow our [Code of Conduct](https://github.com/appwrite/.github/blob/main/CODE_OF_CONDUCT.md).

-## Submit a Pull Request :rocket:
+## Submit a Pull Request 🚀

 Branch naming convention is as following

@@ -65,13 +65,13 @@ Now, go a step further by running the linter using the following command to manu
 composer lint <your file path>
 ```

-This will give you a list of errors to rectify. If you need more information on the errors, you can pass in additional command line arguments to get more verbose information. More lists of available arguments can be found [on PHP_Codesniffer usage Wiki](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Usage). A very useful command line argument is `--report=diff`. This will give you the expected changes by the linter for easy fixing of formatting issues.
+This will give you a list of errors to rectify. If you need more information on the errors, you can pass in additional command line arguments to get more verbose information. More lists of available arguments can be found [here](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Usage). A very useful command line argument is `--report=diff`. This will give you the expected changes by the linter for easy fixing of formatting issues.

 ```bash
 composer lint --report=diff <your file path>
 ```

-5. Push changes to GitHub
+5. Push changes to GitHub.

 ```
 $ git push origin [name_of_your_new_branch]
@@ -163,6 +163,28 @@ 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.
@@ -301,7 +323,7 @@ Adding a new dependency should have vital value for the product with minimum pos

 ## Introducing New Features

-We would :sparkling_heart: you to contribute to Appwrite, but we also want to ensure Appwrite is loyal to its vision and mission statement :pray:.
+We would 💖 you to contribute to Appwrite, but we also want to ensure Appwrite is loyal to its vision and mission statement 🙏.

 For us to find the right balance, please open an issue explaining your ideas before introducing a new pull request.

@@ -367,7 +389,7 @@ In file `app/controllers/shared/api.php` On the database listener, add to an exi

 ```php
      case $document->getCollection() === 'teams':
-            $queueForStatsUsage
+            $queueForUsage
                ->addMetric(METRIC_TEAMS, $value); // per project
            break;
 ```
@@ -379,10 +401,10 @@ In that case you need also to handle children removal using addReduce() method c
 ```php

 case $document->getCollection() === 'buckets': //buckets
-            $queueForStatsUsage
+            $queueForUsage
                ->addMetric(METRIC_BUCKETS, $value); // per project
            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForStatsUsage
+                $queueForUsage
                    ->addReduce($document);
            }
            break;
@@ -428,16 +450,16 @@ public function __construct()
      ->inject('dbForProject')
      ->inject('queueForFunctions')
      ->inject('queueForEvents')
-      ->inject('queueForStatsUsage')
+      ->inject('queueForUsage')
      ->inject('log')
-      ->callback(fn (Message $message, Database $dbForProject, Func $queueForFunctions, Event $queueForEvents, StatsUsage $queueForStatsUsage, Log $log) => $this->action($message, $dbForProject, $queueForFunctions, $queueForEvents, $queueForStatsUsage, $log));
+      ->callback(fn (Message $message, Database $dbForProject, Func $queueForFunctions, Event $queueForEvents, Usage $queueForUsage, Log $log) => $this->action($message, $dbForProject, $queueForFunctions, $queueForEvents, $queueForUsage, $log));
 }
 ```

 and then trigger the queue with the new metric like so: 

 ```php
-$queueForStatsUsage
+$queueForUsage
  ->addMetric(METRIC_BUILDS, 1)
  ->addMetric(METRIC_BUILDS_STORAGE, $build->getAttribute('size', 0))
  ->addMetric(METRIC_BUILDS_COMPUTE, (int)$build->getAttribute('duration', 0) * 1000)
@@ -640,7 +662,7 @@ Pull requests are great, but there are many other ways you can help Appwrite.

 ### Blogging & Speaking

-Blogging, speaking about, or creating tutorials about one of Appwrite’s many features are great ways to get the word out about Appwrite. Mention [@appwrite on Twitter](https://twitter.com/appwrite) and/or [email team@appwrite.io](mailto:team@appwrite.io) so we can give pointers and tips and help you spread the word by promoting your content on the different Appwrite communication channels. Please add your blog posts and videos of talks to our [Awesome Appwrite](https://github.com/appwrite/awesome-appwrite) repo on GitHub.
+Blogging, speaking about, or creating tutorials about one of Appwrite’s many features are great ways to get the word out about Appwrite. Mention [@appwrite](https://twitter.com/appwrite) on Twitter and/or [email team@appwrite.io](mailto:team@appwrite.io) so we can give pointers and tips and help you spread the word by promoting your content on the different Appwrite communication channels. Please add your blog posts and videos of talks to our [Awesome Appwrite](https://github.com/appwrite/awesome-appwrite) repo on GitHub.

 ### Presenting at Meetups

@@ -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.10.1 AS final
+FROM appwrite/base:0.9.5 AS final

 LABEL maintainer="team@appwrite.io"

@@ -85,10 +85,8 @@ RUN chmod +x /usr/local/bin/doctor && \
    chmod +x /usr/local/bin/worker-messaging && \
    chmod +x /usr/local/bin/worker-migrations && \
    chmod +x /usr/local/bin/worker-webhooks && \
-    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

 # Letsencrypt Permissions
 RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/
@@ -1,8 +1,8 @@
-> 好消息！Appwrite 云现已进入公开测试版！立即访问 cloud.appwrite.io 注册，体验无忧的托管服务。今天就加入我们的云端吧！:cloud: :tada:
+> 好消息！Appwrite 云现已进入公开测试版！立即访问 cloud.appwrite.io 注册，体验无忧的托管服务。今天就加入我们的云端吧！☁️🎉

 <br />
 <p align="center">
-    <a href="https://appwrite.io" target="_blank"><img src="./public/images/banner.png" alt="Appwrite banner with logo and slogan build like a team of hundreds""></a>
+    <a href="https://appwrite.io" target="_blank"><img src="./public/images/banner.png" alt="Appwrite Logo"></a>
    <br />
    <br />
    <b>适用于[Flutter/Vue/Angular/React/iOS/Android/* 等等平台 *]的完整后端服务</b>
@@ -36,8 +36,6 @@ Appwrite 可以提供给开发者用户验证，外部授权，用户数据读

 内容：

-
- [开始](#开始)
 - [安装](#安装)
  - [Unix](#unix)
  - [Windows](#windows)
@@ -56,9 +54,6 @@ Appwrite 可以提供给开发者用户验证，外部授权，用户数据读
 - [订阅我们](#订阅我们)
 - [版权说明](#版权说明)

-## 开始
-要轻松开始使用Appwrite，您可以[**免费注册Appwrite Cloud**](https://cloud.appwrite.io/)。在Appwrite Cloud公开测试版期间，您可以完全免费使用Appwrite，而且我们不会收集您的信用卡信息。
-
 ## 安装

 Appwrite 的容器化服务器只需要一行指令就可以运行。您可以使用 docker-compose 在本地主机上运行 Appwrite，也可以在任何其他容器化工具（如 [Kubernetes](https://kubernetes.io/docs/home/)、[Docker Swarm](https://docs.docker.com/engine/swarm/) 或 [Rancher](https://rancher.com/docs/)）上运行 Appwrite。
@@ -72,7 +67,7 @@ docker run -it --rm \
    --volume /var/run/docker.sock:/var/run/docker.sock \
    --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
    --entrypoint="install" \
-    appwrite/appwrite:1.6.2
+    appwrite/appwrite:1.6.1
 ```

 ### Windows
@@ -84,7 +79,7 @@ docker run -it --rm ^
    --volume //var/run/docker.sock:/var/run/docker.sock ^
    --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
    --entrypoint="install" ^
-    appwrite/appwrite:1.6.2
+    appwrite/appwrite:1.6.1
 ```

 #### PowerShell
@@ -94,7 +89,7 @@ docker run -it --rm `
    --volume /var/run/docker.sock:/var/run/docker.sock `
    --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
    --entrypoint="install" `
-    appwrite/appwrite:1.6.2
+    appwrite/appwrite:1.6.1
 ```

 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。
@@ -103,42 +98,7 @@ docker run -it --rm `

 ### 从旧版本升级

-如果您从旧版本升级 Appwrite 服务器，则应在设置完成后使用 Appwrite 迁移工具。有关这方面的更多信息，请查看 [安装文档](https://appwrite.io/docs/self-hosting)。
-
-## 一键配置
-
-除了在本地运行 Appwrite，您还可以使用预配置的设置启动 Appwrite。这样可以让您快速启动并运行 Appwrite，而无需在本地计算机上安装 Docker。
-
-请从以下提供商中选择一个：
-
-<table border="0">
-  <tr>
-    <td align="center" width="100" height="100">
-      <a href="https://marketplace.digitalocean.com/apps/appwrite">
-        <img width="50" height="39" src="public/images/integrations/digitalocean-logo.svg" alt="DigitalOcean Logo" />
-          <br /><sub><b>DigitalOcean</b></sub></a>
-        </a>
-    </td>
-    <td align="center" width="100" height="100">
-      <a href="https://gitpod.io/#https://github.com/appwrite/integration-for-gitpod">
-        <img width="50" height="39" src="public/images/integrations/gitpod-logo.svg" alt="Gitpod Logo" />
-          <br /><sub><b>Gitpod</b></sub></a>    
-      </a>
-    </td>
-    <td align="center" width="100" height="100">
-      <a href="https://www.linode.com/marketplace/apps/appwrite/appwrite/">
-        <img width="50" height="39" src="public/images/integrations/akamai-logo.svg" alt="Akamai Logo" />
-          <br /><sub><b>Akamai Compute</b></sub></a>    
-      </a>
-    </td>
-    <td align="center" width="100" height="100">
-      <a href="https://aws.amazon.com/marketplace/pp/prodview-2hiaeo2px4md6">
-        <img width="50" height="39" src="public/images/integrations/aws-logo.svg" alt="AWS Logo" />
-          <br /><sub><b>AWS Marketplace</b></sub></a>    
-      </a>
-    </td>
-  </tr>
-</table>
+如果您从旧版本升级 Appwrite 服务器，则应在设置完成后使用 Appwrite 迁移工具。有关这方面的更多信息，请查看 [安装文档](https://appwrite.io/docs/installation)。

 ## 入门

@@ -186,25 +146,29 @@ docker run -it --rm `
 以下是当前支持的平台和语言列表。如果您想帮助我们为您选择的平台添加支持，您可以访问我们的 [SDK 生成器](https://github.com/appwrite/sdk-generator) 项目并查看我们的 [贡献指南](https://github.com/appwrite/sdk-generator/blob/master/CONTRIBUTING.md)。

 #### 客户端
-* :white_check_mark:  &nbsp; [Web](https://github.com/appwrite/sdk-for-web) (由 Appwrite 团队维护)
-* :white_check_mark:  &nbsp; [Flutter](https://github.com/appwrite/sdk-for-flutter) (由 Appwrite 团队维护)
-* :white_check_mark:  &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) - **公测** (由 Appwrite 团队维护)
-* :white_check_mark:  &nbsp; [Android](https://github.com/appwrite/sdk-for-android) (由 Appwrite 团队维护)
+
+- ✅ &nbsp; [Web](https://github.com/appwrite/sdk-for-web) (由 Appwrite 团队维护)
+- ✅ &nbsp; [Flutter](https://github.com/appwrite/sdk-for-flutter) (由 Appwrite 团队维护)
+- ✅ &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) (由 Appwrite 团队维护)
+- ✅ &nbsp; [Android](https://github.com/appwrite/sdk-for-android) (由 Appwrite 团队维护)
+- ✅ &nbsp; [React Native](https://github.com/appwrite/sdk-for-react-native) - **公测** (由 Appwrite 团队维护)

 #### 服务器
-* :white_check_mark:  &nbsp; [NodeJS](https://github.com/appwrite/sdk-for-node) (由 Appwrite 团队维护)
-* :white_check_mark:  &nbsp; [PHP](https://github.com/appwrite/sdk-for-php) (由 Appwrite 团队维护)
-* :white_check_mark:  &nbsp; [Dart](https://github.com/appwrite/sdk-for-dart) - (由 Appwrite 团队维护)
-* :white_check_mark:  &nbsp; [Deno](https://github.com/appwrite/sdk-for-deno) - **公测** (由 Appwrite 团队维护)
-* :white_check_mark:  &nbsp; [Ruby](https://github.com/appwrite/sdk-for-ruby) (由 Appwrite 团队维护)
-* :white_check_mark:  &nbsp; [Python](https://github.com/appwrite/sdk-for-python) (由 Appwrite 团队维护)
-* :white_check_mark:  &nbsp; [Kotlin](https://github.com/appwrite/sdk-for-kotlin) - **公测** (由 Appwrite 团队维护)
-* :white_check_mark:  &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) - **公测** (由 Appwrite 团队维护)
-* :white_check_mark:  &nbsp; [.NET](https://github.com/appwrite/sdk-for-dotnet) - **公测** (由 Appwrite 团队维护)
+
+- ✅ &nbsp; [NodeJS](https://github.com/appwrite/sdk-for-node) (由 Appwrite 团队维护)
+- ✅ &nbsp; [PHP](https://github.com/appwrite/sdk-for-php) (由 Appwrite 团队维护)
+- ✅ &nbsp; [Dart](https://github.com/appwrite/sdk-for-dart) (由 Appwrite 团队维护)
+- ✅ &nbsp; [Deno](https://github.com/appwrite/sdk-for-deno) (由 Appwrite 团队维护)
+- ✅ &nbsp; [Ruby](https://github.com/appwrite/sdk-for-ruby) (由 Appwrite 团队维护)
+- ✅ &nbsp; [Python](https://github.com/appwrite/sdk-for-python) (由 Appwrite 团队维护)
+- ✅ &nbsp; [Kotlin](https://github.com/appwrite/sdk-for-kotlin) (由 Appwrite 团队维护)
+- ✅ &nbsp; [Swift](https://github.com/appwrite/sdk-for-swift) (由 Appwrite 团队维护)
+- ✅ &nbsp; [.NET](https://github.com/appwrite/sdk-for-dotnet) - **公测** (由 Appwrite 团队维护)

 #### 开发者社区
-* :white_check_mark:  &nbsp; [Appcelerator Titanium](https://github.com/m1ga/ti.appwrite) (维护者 [Michael Gangolf](https://github.com/m1ga/))  
-* :white_check_mark:  &nbsp; [Godot Engine](https://github.com/GodotNuts/appwrite-sdk) (维护者 [fenix-hub @GodotNuts](https://github.com/fenix-hub))  
+
+- ✅ &nbsp; [Appcelerator Titanium](https://github.com/m1ga/ti.appwrite) (维护者 [Michael Gangolf](https://github.com/m1ga/))
+- ✅ &nbsp; [Godot Engine](https://github.com/GodotNuts/appwrite-sdk) (维护者 [fenix-hub @GodotNuts](https://github.com/fenix-hub))

 找不到需要的的 SDK？ - 欢迎通过发起 PR 来帮助我们完善 Appwrite 的软件生态环境 [SDK 生成器](https://github.com/appwrite/sdk-generator)!

@@ -1,8 +1,8 @@
-> [Get started with Appwrite](https://apwr.dev/appcloud)
+> Appwrite Init has concluded! You can check out all the latest announcements [on our Init website](https://appwrite.io/init) 🚀

 <br />
 <p align="center">
-    <a href="https://appwrite.io" target="_blank"><img src="./public/images/banner.png" alt="Appwrite banner, with logo and text saying "Build Like a Team of Hundreds"></a>
+    <a href="https://appwrite.io" target="_blank"><img src="./public/images/banner.png" alt="Appwrite Logo"></a>
    <br />
    <br />
    <b>Appwrite is a backend platform for developing Web, Mobile, and Flutter applications. Built with the open source community and optimized for developer experience in the coding languages you love.</b>
@@ -12,11 +12,11 @@

 <!-- [![Build Status](https://img.shields.io/travis/com/appwrite/appwrite?style=flat-square)](https://travis-ci.com/appwrite/appwrite) -->

-[![We're Hiring label](https://img.shields.io/static/v1?label=We're&message=Hiring&color=blue&style=flat-square)](https://appwrite.io/company/careers)
-[![Hacktoberfest label](https://img.shields.io/static/v1?label=hacktoberfest&message=ready&color=191120&style=flat-square)](https://hacktoberfest.appwrite.io)
-[![Discord label](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord?r=Github)
-[![Build Status label](https://img.shields.io/github/actions/workflow/status/appwrite/appwrite/tests.yml?branch=master&label=tests&style=flat-square)](https://github.com/appwrite/appwrite/actions)
-[![X Account label](https://img.shields.io/twitter/follow/appwrite?color=00acee&label=twitter&style=flat-square)](https://twitter.com/appwrite)
+[![We're Hiring](https://img.shields.io/static/v1?label=We're&message=Hiring&color=blue&style=flat-square)](https://appwrite.io/company/careers)
+[![Hacktoberfest](https://img.shields.io/static/v1?label=hacktoberfest&message=ready&color=191120&style=flat-square)](https://hacktoberfest.appwrite.io)
+[![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord?r=Github)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/appwrite/appwrite/tests.yml?branch=master&label=tests&style=flat-square)](https://github.com/appwrite/appwrite/actions)
+[![X Account](https://img.shields.io/twitter/follow/appwrite?color=00acee&label=twitter&style=flat-square)](https://twitter.com/appwrite)

 <!-- [![Docker Pulls](https://img.shields.io/docker/pulls/appwrite/appwrite?color=f02e65&style=flat-square)](https://hub.docker.com/r/appwrite/appwrite) -->
 <!-- [![Translate](https://img.shields.io/badge/translate-f02e65?style=flat-square)](docs/tutorials/add-translations.md) -->
@@ -24,9 +24,11 @@

 English | [简体中文](README-CN.md)

+[**Announcing Appwrite Cloud Public Beta! Sign up today!**](https://cloud.appwrite.io)
+
 Appwrite is an end-to-end backend server for Web, Mobile, Native, or Backend apps packaged as a set of Docker<nobr> microservices. Appwrite abstracts the complexity and repetitiveness required to build a modern backend API from scratch and allows you to build secure apps faster.

-Using Appwrite, you can easily integrate your app with user authentication and multiple sign-in methods, a database for storing and querying users and team data, storage and file management, image manipulation, Cloud Functions, messaging, and [more services](https://appwrite.io/docs).
+Using Appwrite, you can easily integrate your app with user authentication and multiple sign-in methods, a database for storing and querying users and team data, storage and file management, image manipulation, Cloud Functions, and [more services](https://appwrite.io/docs).

 <p align="center">
    <br />
@@ -35,14 +37,13 @@ Using Appwrite, you can easily integrate your app with user authentication and m
    <br />
 </p>

-![Appwrite project dashboard showing various Appwrite features](public/images/github.png)
+![Appwrite](public/images/github.png)

-Find out more at: [https://appwrite.io](https://appwrite.io).
+Find out more at: [https://appwrite.io](https://appwrite.io)

 Table of Contents:

- [Getting Started](#getting-started)
- [Self-Hosting](#self-hosting)
+- [Installation](#installation)
  - [Unix](#unix)
  - [Windows](#windows)
    - [CMD](#cmd)
@@ -50,7 +51,7 @@ Table of Contents:
  - [Upgrade from an Older Version](#upgrade-from-an-older-version)
 - [One-Click Setups](#one-click-setups)
 - [Getting Started](#getting-started)
-  - [Products](#products)
+  - [Services](#services)
  - [SDKs](#sdks)
    - [Client](#client)
    - [Server](#server)
@@ -61,14 +62,11 @@ Table of Contents:
 - [Follow Us](#follow-us)
 - [License](#license)

-## Getting Started
-The easiest way to get started with Appwrite is by [signing up for Appwrite Cloud](https://cloud.appwrite.io/). While Appwrite Cloud is in public beta, you can build with Appwrite completely free, and we won't collect you credit card information. 
-
-## Self-Hosting
+## Installation

 Appwrite is designed to run in a containerized environment. Running your server is as easy as running one command from your terminal. You can either run Appwrite on your localhost using docker-compose or on any other container orchestration tool, such as [Kubernetes](https://kubernetes.io/docs/home/), [Docker Swarm](https://docs.docker.com/engine/swarm/), or [Rancher](https://rancher.com/docs/).

-Before running the installation command, make sure you have [Docker](https://www.docker.com/products/docker-desktop) installed on your machine:
+The easiest way to start running your Appwrite server is by running our docker-compose file. Before running the installation command, make sure you have [Docker](https://www.docker.com/products/docker-desktop) installed on your machine:

 ### Unix

@@ -77,7 +75,7 @@ docker run -it --rm \
    --volume /var/run/docker.sock:/var/run/docker.sock \
    --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
    --entrypoint="install" \
-    appwrite/appwrite:1.6.2
+    appwrite/appwrite:1.6.1
 ```

 ### Windows
@@ -89,7 +87,7 @@ docker run -it --rm ^
    --volume //var/run/docker.sock:/var/run/docker.sock ^
    --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
    --entrypoint="install" ^
-    appwrite/appwrite:1.6.2
+    appwrite/appwrite:1.6.1
 ```

 #### PowerShell
@@ -99,7 +97,7 @@ docker run -it --rm `
    --volume /var/run/docker.sock:/var/run/docker.sock `
    --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
    --entrypoint="install" `
-    appwrite/appwrite:1.6.2
+    appwrite/appwrite:1.6.1
 ```

 Once the Docker installation is complete, go to http://localhost to access the Appwrite console from your browser. Please note that on non-Linux native hosts, the server might take a few minutes to start after completing the installation.
@@ -108,7 +106,7 @@ For advanced production and custom installation, check out our Docker [environme

 ### Upgrade from an Older Version

-If you are upgrading your Appwrite server from an older version, you should use the Appwrite migration tool once your setup is completed. For more information regarding this, check out the [Installation Docs](https://appwrite.io/docs/self-hosting).
+If you are upgrading your Appwrite server from an older version, you should use the Appwrite migration tool once your setup is completed. For more information regarding this, check out the [Installation Docs](https://appwrite.io/docs/installation).

 ## One-Click Setups

@@ -194,34 +192,34 @@ Below is a list of currently supported platforms and languages. If you would lik

 #### Client

- :white_check_mark: &nbsp; [Web](https://github.com/appwrite/sdk-for-web) (Maintained by the Appwrite Team)
- :white_check_mark: &nbsp; [Flutter](https://github.com/appwrite/sdk-for-flutter) (Maintained by the Appwrite Team)
- :white_check_mark: &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) (Maintained by the Appwrite Team)
- :white_check_mark: &nbsp; [Android](https://github.com/appwrite/sdk-for-android) (Maintained by the Appwrite Team)
- :white_check_mark: &nbsp; [React Native](https://github.com/appwrite/sdk-for-react-native) - **Beta** (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Web](https://github.com/appwrite/sdk-for-web) (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Flutter](https://github.com/appwrite/sdk-for-flutter) (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Android](https://github.com/appwrite/sdk-for-android) (Maintained by the Appwrite Team)
+- ✅ &nbsp; [React Native](https://github.com/appwrite/sdk-for-react-native) - **Beta** (Maintained by the Appwrite Team)

 #### Server

- :white_check_mark: &nbsp; [NodeJS](https://github.com/appwrite/sdk-for-node) (Maintained by the Appwrite Team)
- :white_check_mark: &nbsp; [PHP](https://github.com/appwrite/sdk-for-php) (Maintained by the Appwrite Team)
- :white_check_mark: &nbsp; [Dart](https://github.com/appwrite/sdk-for-dart) (Maintained by the Appwrite Team)
- :white_check_mark: &nbsp; [Deno](https://github.com/appwrite/sdk-for-deno) (Maintained by the Appwrite Team)
- :white_check_mark: &nbsp; [Ruby](https://github.com/appwrite/sdk-for-ruby) (Maintained by the Appwrite Team)
- :white_check_mark: &nbsp; [Python](https://github.com/appwrite/sdk-for-python) (Maintained by the Appwrite Team)
- :white_check_mark: &nbsp; [Kotlin](https://github.com/appwrite/sdk-for-kotlin) (Maintained by the Appwrite Team)
- :white_check_mark: &nbsp; [Swift](https://github.com/appwrite/sdk-for-swift) (Maintained by the Appwrite Team)
- :white_check_mark: &nbsp; [.NET](https://github.com/appwrite/sdk-for-dotnet) - **Beta** (Maintained by the Appwrite Team)
+- ✅ &nbsp; [NodeJS](https://github.com/appwrite/sdk-for-node) (Maintained by the Appwrite Team)
+- ✅ &nbsp; [PHP](https://github.com/appwrite/sdk-for-php) (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Dart](https://github.com/appwrite/sdk-for-dart) (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Deno](https://github.com/appwrite/sdk-for-deno) (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Ruby](https://github.com/appwrite/sdk-for-ruby) (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Python](https://github.com/appwrite/sdk-for-python) (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Kotlin](https://github.com/appwrite/sdk-for-kotlin) (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Swift](https://github.com/appwrite/sdk-for-swift) (Maintained by the Appwrite Team)
+- ✅ &nbsp; [.NET](https://github.com/appwrite/sdk-for-dotnet) - **Beta** (Maintained by the Appwrite Team)

 #### Community

- :white_check_mark: &nbsp; [Appcelerator Titanium](https://github.com/m1ga/ti.appwrite) (Maintained by [Michael Gangolf](https://github.com/m1ga/))
- :white_check_mark: &nbsp; [Godot Engine](https://github.com/GodotNuts/appwrite-sdk) (Maintained by [fenix-hub @GodotNuts](https://github.com/fenix-hub))
+- ✅ &nbsp; [Appcelerator Titanium](https://github.com/m1ga/ti.appwrite) (Maintained by [Michael Gangolf](https://github.com/m1ga/))
+- ✅ &nbsp; [Godot Engine](https://github.com/GodotNuts/appwrite-sdk) (Maintained by [fenix-hub @GodotNuts](https://github.com/fenix-hub))

 Looking for more SDKs? - Help us by contributing a pull request to our [SDK Generator](https://github.com/appwrite/sdk-generator)!

 ## Architecture

-![Appwrite Architecture showing how Appwrite is built and the services and tools it uses](docs/specs/overview.drawio.svg)
+![Appwrite Architecture](docs/specs/overview.drawio.svg)

 Appwrite uses a microservices architecture that was designed for easy scaling and delegation of responsibilities. In addition, Appwrite supports multiple APIs, such as REST, WebSocket, and GraphQL to allow you to interact with your resources by leveraging your existing knowledge and protocols of choice.

@@ -231,7 +229,7 @@ The Appwrite API layer was designed to be extremely fast by leveraging in-memory

 All code contributions, including those of people having commit access, must go through a pull request and be approved by a core developer before being merged. This is to ensure a proper review of all the code.

-We truly :heart: pull requests! If you wish to help, you can learn more about how you can contribute to this project in the [contribution guide](CONTRIBUTING.md).
+We truly ❤️ pull requests! If you wish to help, you can learn more about how you can contribute to this project in the [contribution guide](CONTRIBUTING.md).

 ## Security

@@ -5,8 +5,6 @@ require_once __DIR__ . '/init.php';
 use Appwrite\Event\Certificate;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Func;
-use Appwrite\Event\StatsResources;
-use Appwrite\Event\StatsUsage;
 use Appwrite\Platform\Appwrite;
 use Appwrite\Runtimes\Runtimes;
 use Utopia\Cache\Adapter\Sharding;
@@ -25,8 +23,8 @@ use Utopia\Queue\Publisher;
 use Utopia\Registry\Registry;
 use Utopia\System\System;

-// Overwriting runtimes to be architecture agnostic for CLI
-Config::setParam('runtimes', (new Runtimes('v4'))->getAll(supported: false));
+// overwriting runtimes to be architectur agnostic for CLI
+Config::setParam('runtimes', (new Runtimes('v4rc'))->getAll(supported: false));

 // require controllers after overwriting runtimes
 require_once __DIR__ . '/controllers/general.php';
@@ -43,7 +41,8 @@ CLI::setResource('cache', function ($pools) {
        $adapters[] = $pools
            ->get($value)
            ->pop()
-            ->getResource();
+            ->getResource()
+        ;
    }

    return new Cache(new Sharding($adapters));
@@ -98,10 +97,6 @@ CLI::setResource('dbForPlatform', function ($pools, $cache) {
    return $dbForPlatform;
 }, ['pools', 'cache']);

-CLI::setResource('console', function () {
-    return new Document(Config::getParam('console'));
-}, []);
-
 CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache) {
    $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools

@@ -165,45 +160,6 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform
    };
 }, ['pools', 'dbForPlatform', 'cache']);

-CLI::setResource('getLogsDB', function (Group $pools, Cache $cache) {
-    $database = null;
-    return function (?Document $project = null) use ($pools, $cache, $database) {
-        if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getInternalId());
-            return $database;
-        }
-
-        $dbAdapter = $pools
-            ->get('logs')
-            ->pop()
-            ->getResource();
-
-        $database = new Database(
-            $dbAdapter,
-            $cache
-        );
-
-        $database
-            ->setSharedTables(true)
-            ->setNamespace('logsV1')
-            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_TASK)
-            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
-
-        // set tenant
-        if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getInternalId());
-        }
-
-        return $database;
-    };
-}, ['pools', 'cache']);
-
-CLI::setResource('queueForStatsUsage', function (Connection $publisher) {
-    return new StatsUsage($publisher);
-}, ['publisher']);
-CLI::setResource('queueForStatsResources', function (Publisher $publisher) {
-    return new StatsResources($publisher);
-}, ['publisher']);
 CLI::setResource('publisher', function (Group $pools) {
    return $pools->get('publisher')->pop()->getResource();
 }, ['pools']);
@@ -16,6 +16,5 @@ return [
    'union-china-pay' => ['name' => 'Union China Pay', 'path' => __DIR__ . '/credit-cards/union-china-pay.png'],
    'visa' => ['name' => 'Visa', 'path' => __DIR__ . '/credit-cards/visa.png'],
    'mir' => ['name' => 'MIR', 'path' => __DIR__ . '/credit-cards/mir.png'],
-    'maestro' => ['name' => 'Maestro', 'path' => __DIR__ . '/credit-cards/maestro.png'],
-    'rupay' => ['name' => 'Rupay', 'path' => __DIR__ . '/credit-cards/rupay.png']
+    'maestro' => ['name' => 'Maestro', 'path' => __DIR__ . '/credit-cards/maestro.png']
 ];
@@ -5,7 +5,6 @@ $common = include __DIR__ . '/collections/common.php';
 $projects = include __DIR__ . '/collections/projects.php';
 $databases = include __DIR__ . '/collections/databases.php';
 $platform = include __DIR__ . '/collections/platform.php';
-$logs = include __DIR__ . '/collections/logs.php';

 // see - http.php#245
 // $collections['buckets']['files'];
@@ -28,7 +27,6 @@ $collections = [
    'databases' => $databases,
    'projects' => array_merge($projects, $common),
    'console' => array_merge($platform, $common),
-    'logs' => $logs,
 ];

 return $collections;
@@ -1038,7 +1038,7 @@ return [
                '$id' => ID::custom('providerUid'),
                'type' => Database::VAR_STRING,
                'format' => '',
-                'size' => 2048, // Decrease to 128 as in index length?
+                'size' => 2048,
                'signed' => true,
                'required' => false,
                'default' => null,
@@ -1107,14 +1107,14 @@ return [
                '$id' => ID::custom('_key_userInternalId_provider_providerUid'),
                'type' => Database::INDEX_UNIQUE,
                'attributes' => ['userInternalId', 'provider', 'providerUid'],
-                'lengths' => [11, 128, 128], // providerUid is length 2000!
+                'lengths' => [11, 128, 128],
                'orders' => [Database::ORDER_ASC, Database::ORDER_ASC],
            ],
            [
                '$id' => ID::custom('_key_provider_providerUid'),
                'type' => Database::INDEX_UNIQUE,
                'attributes' => ['provider', 'providerUid'],
-                'lengths' => [128, 128], // providerUid is length 2000!
+                'lengths' => [128, 128],
                'orders' => [Database::ORDER_ASC, Database::ORDER_ASC],
            ],
            [
@@ -1,94 +0,0 @@
-<?php
-
-use Utopia\Database\Database;
-use Utopia\Database\Helpers\ID;
-
-$logsCollection = [];
-
-$logsCollection['stats'] = [
-    '$collection' => ID::custom(Database::METADATA),
-    '$id' => ID::custom('stats'),
-    'name' => 'stats',
-    'attributes' => [
-        [
-            '$id' => ID::custom('metric'),
-            'type' => Database::VAR_STRING,
-            'format' => '',
-            'size' => 255,
-            'signed' => true,
-            'required' => true,
-            'default' => null,
-            'array' => false,
-            'filters' => [],
-        ],
-        [
-            '$id' => ID::custom('region'),
-            'type' => Database::VAR_STRING,
-            'format' => '',
-            'size' => 255,
-            'signed' => true,
-            'required' => true,
-            'default' => null,
-            'array' => false,
-            'filters' => [],
-        ],
-        [
-            '$id' => ID::custom('value'),
-            'type' => Database::VAR_INTEGER,
-            'format' => '',
-            'size' => 8,
-            'signed' => true,
-            'required' => true,
-            'default' => null,
-            'array' => false,
-            'filters' => [],
-        ],
-        [
-            '$id' => ID::custom('time'),
-            'type' => Database::VAR_DATETIME,
-            'format' => '',
-            'size' => 0,
-            'signed' => false,
-            'required' => false,
-            'default' => null,
-            'array' => false,
-            'filters' => ['datetime'],
-        ],
-        [
-            '$id' => ID::custom('period'),
-            'type' => Database::VAR_STRING,
-            'format' => '',
-            'size' => 4,
-            'signed' => true,
-            'required' => true,
-            'default' => null,
-            'array' => false,
-            'filters' => [],
-        ],
-    ],
-    'indexes' => [
-        [
-            '$id' => ID::custom('_key_time'),
-            'type' => Database::INDEX_KEY,
-            'attributes' => ['time'],
-            'lengths' => [],
-            'orders' => [Database::ORDER_DESC],
-        ],
-        [
-            '$id' => ID::custom('_key_period_time'),
-            'type' => Database::INDEX_KEY,
-            'attributes' => ['period', 'time'],
-            'lengths' => [],
-            'orders' => [Database::ORDER_ASC],
-        ],
-        [
-            '$id' => ID::custom('_key_metric_period_time'),
-            'type' => Database::INDEX_UNIQUE,
-            'attributes' => ['metric', 'period', 'time'],
-            'lengths' => [],
-            'orders' => [Database::ORDER_DESC],
-        ],
-    ],
-];
-
-return $logsCollection;
@@ -1066,29 +1066,7 @@ return [
                'default' => null,
                'array' => false,
                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('owner'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16,
-                'signed' => true,
-                'required' => false,
-                'default' => '', // "Appwrite" or empty string
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('region'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
+            ]
        ],
        'indexes' => [
            [
@@ -1133,20 +1111,6 @@ return [
                'lengths' => [],
                'orders' => [Database::ORDER_ASC],
            ],
-            [
-                '$id' => ID::custom('_key_owner'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['owner'],
-                'lengths' => [16],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_region'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['region'],
-                'lengths' => [16],
-                'orders' => [Database::ORDER_ASC],
-            ],
        ],
    ],

@@ -708,7 +708,7 @@ return [
                'size' => 128,
                'signed' => false,
                'required' => false,
-                'default' => APP_FUNCTION_SPECIFICATION_DEFAULT,
+                'default' => APP_COMPUTE_SPECIFICATION_DEFAULT,
                'filters' => [],
            ],
            [
@@ -797,6 +797,364 @@ 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'),
@@ -879,6 +1237,39 @@ 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,
@@ -1340,7 +1731,7 @@ return [
        'name' => 'Executions',
        'attributes' => [
            [
-                '$id' => ID::custom('functionInternalId'),
+                '$id' => ID::custom('resourceInternalId'),
                'type' => Database::VAR_STRING,
                'format' => '',
                'size' => Database::LENGTH_KEY,
@@ -1351,7 +1742,18 @@ return [
                'filters' => [],
            ],
            [
-                '$id' => ID::custom('functionId'),
+                '$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'),
                'type' => Database::VAR_STRING,
                'format' => '',
                'size' => Database::LENGTH_KEY,
@@ -1540,9 +1942,9 @@ return [
        ],
        'indexes' => [
            [
-                '$id' => ID::custom('_key_function'),
+                '$id' => ID::custom('_key_resource'),
                'type' => Database::INDEX_KEY,
-                'attributes' => ['functionId'],
+                'attributes' => ['resourceInternalId', 'resourceType', 'resourceId'],
                'lengths' => [Database::LENGTH_KEY],
                'orders' => [Database::ORDER_ASC],
            ],
@@ -1665,6 +2067,17 @@ 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,
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Initializes console project document.
- */
-
-use Appwrite\Auth\Auth;
-use Appwrite\Network\Validator\Origin;
-use Utopia\Database\Helpers\ID;
-use Utopia\System\System;
-
-$console = [
-    '$id' => ID::custom('console'),
-    '$internalId' => ID::custom('console'),
-    'name' => 'Appwrite',
-    '$collection' => ID::custom('projects'),
-    'description' => 'Appwrite core engine',
-    'logo' => '',
-    'teamId' => null,
-    'webhooks' => [],
-    'keys' => [],
-    'platforms' => [
-        [
-            '$collection' => ID::custom('platforms'),
-            'name' => 'Localhost',
-            'type' => Origin::CLIENT_TYPE_WEB,
-            'hostname' => 'localhost',
-        ], // Current host is added on app init
-    ],
-    'region' => 'fra',
-    'legalName' => '',
-    'legalCountry' => '',
-    'legalState' => '',
-    'legalCity' => '',
-    'legalAddress' => '',
-    'legalTaxId' => '',
-    'auths' => [
-        'mockNumbers' => [],
-        'invites' => System::getEnv('_APP_CONSOLE_INVITES', 'enabled') === 'enabled',
-        'limit' => (System::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled') === 'enabled') ? 1 : 0, // limit signup to 1 user
-        'duration' => Auth::TOKEN_EXPIRATION_LOGIN_LONG, // 1 Year in seconds
-        'sessionAlerts' => System::getEnv('_APP_CONSOLE_SESSION_ALERTS', 'disabled') === 'enabled'
-    ],
-    'authWhitelistEmails' => (!empty(System::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null))) ? \explode(',', System::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null)) : [],
-    'authWhitelistIPs' => (!empty(System::getEnv('_APP_CONSOLE_WHITELIST_IPS', null))) ? \explode(',', System::getEnv('_APP_CONSOLE_WHITELIST_IPS', null)) : [],
-    'oAuthProviders' => [
-        'githubEnabled' => true,
-        'githubSecret' => System::getEnv('_APP_CONSOLE_GITHUB_SECRET', ''),
-        'githubAppid' => System::getEnv('_APP_CONSOLE_GITHUB_APP_ID', '')
-    ],
-];
-
-return $console;
@@ -356,7 +356,7 @@ return [
    ],
    Exception::TEAM_INVALID_SECRET => [
        'name' => Exception::TEAM_INVALID_SECRET,
-        'description' => 'The team invitation secret is invalid. Please request a new invitation and try again.',
+        'description' => 'The team invitation secret is invalid. Please request  a new invitation and try again.',
        'code' => 401,
    ],
    Exception::TEAM_MEMBERSHIP_MISMATCH => [
@@ -375,6 +375,13 @@ 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,
@@ -535,6 +542,23 @@ 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,
@@ -577,6 +601,13 @@ 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,
@@ -844,6 +875,11 @@ 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.',
@@ -217,6 +217,34 @@ 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,
@@ -0,0 +1,185 @@
+<?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' => '',
+            ]
+        ]
+    ],
+    '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' => '',
+            ]
+        ]
+    ],
+    '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' => '',
+            ],
+        ]
+    ],
+];
@@ -0,0 +1,51 @@
+<?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
+    ]
+];
@@ -1,39 +1,8 @@
 <?php

-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']
-    ],
-];
+use Utopia\Config\Config;
+
+$templateRuntimes = Config::getParam('template-runtimes');

 function getRuntimes($runtime, $commands, $entrypoint, $providerRootDirectory, $versionsDenyList = [])
 {
@@ -62,24 +31,24 @@ return [
        'timeout' => 15,
        'useCases' => ['starter'],
        'runtimes' => [
-            ...getRuntimes(TEMPLATE_RUNTIMES['NODE'], 'npm install', 'src/main.js', 'node/starter'),
+            ...getRuntimes($templateRuntimes['NODE'], 'npm install', 'src/main.js', 'node/starter'),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PYTHON'],
+                $templateRuntimes['PYTHON'],
                'pip install -r requirements.txt',
                'src/main.py',
                'python/starter'
            ),
-            ...getRuntimes(TEMPLATE_RUNTIMES['DART'], 'dart pub get', 'lib/main.dart', 'dart/starter'),
-            ...getRuntimes(TEMPLATE_RUNTIMES['GO'], '', 'main.go', 'go/starter'),
+            ...getRuntimes($templateRuntimes['DART'], 'dart pub get', 'lib/main.dart', 'dart/starter'),
+            ...getRuntimes($templateRuntimes['GO'], '', 'main.go', 'go/starter'),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PHP'],
+                $templateRuntimes['PHP'],
                'composer install',
                'src/index.php',
                'php/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'),
+            ...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'),
        ],
        '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',
@@ -101,7 +70,7 @@ return [
        'useCases' => ['databases'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/query-upstash-vector'
@@ -145,7 +114,7 @@ return [
        'useCases' => ['databases'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/query-redis-labs'
@@ -188,7 +157,7 @@ return [
        'useCases' => ['databases'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/query-neo4j-auradb'
@@ -240,7 +209,7 @@ return [
        'useCases' => ['databases'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/query-mongo-atlas'
@@ -277,7 +246,7 @@ return [
        'useCases' => ['databases'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/query-neon-postgres'
@@ -344,25 +313,25 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/prompt-chatgpt'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PYTHON'],
+                $templateRuntimes['PYTHON'],
                'pip install -r requirements.txt',
                'src/main.py',
                'python/prompt_chatgpt'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PHP'],
+                $templateRuntimes['PHP'],
                'composer install',
                'src/index.php',
                'php/prompt-chatgpt'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['DART'],
+                $templateRuntimes['DART'],
                'dart pub get',
                'lib/main.dart',
                'dart/prompt_chatgpt'
@@ -405,19 +374,19 @@ return [
        'useCases' => ['messaging'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install && npm run setup',
                'src/main.js',
                'node/discord-command-bot'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PYTHON'],
+                $templateRuntimes['PYTHON'],
                'pip install -r requirements.txt && python src/setup.py',
                'src/main.py',
                'python/discord_command_bot'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['GO'],
+                $templateRuntimes['GO'],
                '',
                'main.go',
                'go/discord-command-bot'
@@ -468,7 +437,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/analyze-with-perspectiveapi'
@@ -504,19 +473,19 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/censor-with-redact'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PYTHON'],
+                $templateRuntimes['PYTHON'],
                'pip install -r requirements.txt',
                'src/main.py',
                'python/censor_with_redact'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['DART'],
+                $templateRuntimes['DART'],
                'dart pub get',
                'lib/main.dart',
                'dart/censor_with_redact'
@@ -550,7 +519,7 @@ return [
        'timeout' => 15,
        'useCases' => ['utilities'],
        'runtimes' => [
-            ...getRuntimes(TEMPLATE_RUNTIMES['NODE'], 'npm install', 'src/main.js', 'node/generate-pdf')
+            ...getRuntimes($templateRuntimes['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',
@@ -573,7 +542,7 @@ return [
        'useCases' => ['dev-tools'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/github-issue-bot'
@@ -616,7 +585,7 @@ return [
        'useCases' => ['utilities'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/url-shortener'
@@ -667,19 +636,19 @@ return [
        'useCases' => ['databases'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/sync-with-algolia'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PYTHON'],
+                $templateRuntimes['PYTHON'],
                'pip install -r requirements.txt',
                'src/main.py',
                'python/sync_with_algolia'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PHP'],
+                $templateRuntimes['PHP'],
                'composer install',
                'src/index.php',
                'php/sync-with-algolia'
@@ -748,31 +717,31 @@ return [
        'useCases' => ['databases'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/sync-with-meilisearch'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PYTHON'],
+                $templateRuntimes['PYTHON'],
                'pip install -r requirements.txt',
                'src/main.py',
                'python/sync-with-meilisearch'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PHP'],
+                $templateRuntimes['PHP'],
                'composer install',
                'src/index.php',
                'php/sync-with-meilisearch'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['BUN'],
+                $templateRuntimes['BUN'],
                'bun install',
                'src/main.ts',
                'bun/sync-with-meilisearch'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['RUBY'],
+                $templateRuntimes['RUBY'],
                'bundle install',
                'lib/main.rb',
                'ruby/sync-with-meilisearch'
@@ -841,37 +810,37 @@ return [
        'useCases' => ['messaging'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/whatsapp-with-vonage'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PYTHON'],
+                $templateRuntimes['PYTHON'],
                'pip install -r requirements.txt',
                'src/main.py',
                'python/whatsapp_with_vonage'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['DART'],
+                $templateRuntimes['DART'],
                'dart pub get',
                'lib/main.dart',
                'dart/whatsapp-with-vonage'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PHP'],
+                $templateRuntimes['PHP'],
                'composer install',
                'src/index.php',
                'php/whatsapp-with-vonage'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['BUN'],
+                $templateRuntimes['BUN'],
                'bun install',
                'src/main.ts',
                'bun/whatsapp-with-vonage'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['RUBY'],
+                $templateRuntimes['RUBY'],
                'bundle install',
                'lib/main.rb',
                'ruby/whatsapp-with-vonage'
@@ -927,7 +896,7 @@ return [
        'useCases' => ['messaging'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/push-notification-with-fcm'
@@ -983,19 +952,19 @@ return [
        'useCases' => ['utilities'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/email-contact-form'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PYTHON'],
+                $templateRuntimes['PYTHON'],
                'pip install -r requirements.txt',
                'src/main.py',
                'python/email_contact_form'
            ),
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['PHP'],
+                $templateRuntimes['PHP'],
                'composer install',
                'src/index.php',
                'php/email-contact-form'
@@ -1066,7 +1035,7 @@ return [
        'useCases' => ['utilities'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/subscriptions-with-stripe'
@@ -1107,7 +1076,7 @@ return [
        'useCases' => ['utilities'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/payments-with-stripe'
@@ -1164,7 +1133,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/text-generation-with-huggingface'
@@ -1198,7 +1167,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/language-translation-with-huggingface'
@@ -1232,7 +1201,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install && npm run setup',
                'src/main.js',
                'node/image-classification-with-huggingface'
@@ -1290,7 +1259,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install && npm run setup',
                'src/main.js',
                'node/object-detection-with-huggingface'
@@ -1348,7 +1317,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install && npm run setup',
                'src/main.js',
                'node/speech-recognition-with-huggingface'
@@ -1406,7 +1375,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install && npm run setup',
                'src/main.js',
                'node/text-to-speech-with-huggingface'
@@ -1464,7 +1433,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/generate-with-replicate'
@@ -1499,7 +1468,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/generate-with-together-ai'
@@ -1541,7 +1510,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/chat-with-perplexity-ai'
@@ -1582,7 +1551,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/generate-with-replicate'
@@ -1617,7 +1586,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/sync-with-pinecone'
@@ -1680,7 +1649,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/rag-with-langchain'
@@ -1743,7 +1712,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/speak-with-elevenlabs'
@@ -1798,7 +1767,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/speak-with-lmnt'
@@ -1839,7 +1808,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/chat-with-anyscale'
@@ -1880,7 +1849,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install && npm run setup',
                'src/main.js',
                'node/music-generation-with-huggingface'
@@ -1922,7 +1891,7 @@ return [
        'useCases' => ['ai'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/generate-with-fal-ai'
@@ -1957,7 +1926,7 @@ return [
        'useCases' => ['utilities'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/subscriptions-with-lemon-squeezy'
@@ -2012,7 +1981,7 @@ return [
        'useCases' => ['utilities'],
        'runtimes' => [
            ...getRuntimes(
-                TEMPLATE_RUNTIMES['NODE'],
+                $templateRuntimes['NODE'],
                'npm install',
                'src/main.js',
                'node/payments-with-lemon-squeezy'
@@ -1,46 +1,11 @@
 <?php

-/**
- * Continent codes with names and approximate central coordinates
- *
- * Coordinates represent approximate geographical centers of each continent
- * Note: These are simplified centroids and may not represent the exact geographical center
- */
-
 return [
-    'AF' => [
-        'name' => 'Africa',
-        'latitude' => 8.7832,
-        'longitude' => 34.5085
-    ],
-    'AN' => [
-        'name' => 'Antarctica',
-        'latitude' => -82.8628,
-        'longitude' => 135.0000
-    ],
-    'AS' => [
-        'name' => 'Asia',
-        'latitude' => 34.0479,
-        'longitude' => 100.6197
-    ],
-    'EU' => [
-        'name' => 'Europe',
-        'latitude' => 54.5260,
-        'longitude' => 15.2551
-    ],
-    'NA' => [
-        'name' => 'North America',
-        'latitude' => 54.5260,
-        'longitude' => -105.2551
-    ],
-    'OC' => [
-        'name' => 'Oceania',
-        'latitude' => -22.7359,
-        'longitude' => 140.0188
-    ],
-    'SA' => [
-        'name' => 'South America',
-        'latitude' => -8.7832,
-        'longitude' => -55.4915
-    ],
+    'AF',
+    'AN',
+    'AS',
+    'EU',
+    'NA',
+    'OC',
+    'SA',
 ];
@@ -1,210 +1,209 @@
 <?php

 /**
- * ISO 3166 standard country codes with country names and coordinates
+ * ISO 3166 standard country codes
 * https://www.iso.org/iso-3166-country-codes.html
 *
 * Source:
 * https://www.iso.org/obp/ui/#search/code/
- * Coordinates source: Natural Earth Data (approximate country centroids)
 */

 return [
-    'AF' => ['name' => 'Afghanistan', 'latitude' => 33.0, 'longitude' => 66.0],
-    'AO' => ['name' => 'Angola', 'latitude' => -12.5, 'longitude' => 18.5],
-    'AL' => ['name' => 'Albania', 'latitude' => 41.0, 'longitude' => 20.0],
-    'AD' => ['name' => 'Andorra', 'latitude' => 42.5, 'longitude' => 1.6],
-    'AE' => ['name' => 'United Arab Emirates', 'latitude' => 24.0, 'longitude' => 54.0],
-    'AR' => ['name' => 'Argentina', 'latitude' => -34.0, 'longitude' => -64.0],
-    'AM' => ['name' => 'Armenia', 'latitude' => 40.0, 'longitude' => 45.0],
-    'AG' => ['name' => 'Antigua and Barbuda', 'latitude' => 17.05, 'longitude' => -61.8],
-    'AU' => ['name' => 'Australia', 'latitude' => -25.0, 'longitude' => 135.0],
-    'AT' => ['name' => 'Austria', 'latitude' => 47.3, 'longitude' => 13.3],
-    'AZ' => ['name' => 'Azerbaijan', 'latitude' => 40.5, 'longitude' => 47.5],
-    'BI' => ['name' => 'Burundi', 'latitude' => -3.5, 'longitude' => 30.0],
-    'BE' => ['name' => 'Belgium', 'latitude' => 50.8, 'longitude' => 4.0],
-    'BJ' => ['name' => 'Benin', 'latitude' => 9.5, 'longitude' => 2.25],
-    'BF' => ['name' => 'Burkina Faso', 'latitude' => 13.0, 'longitude' => -2.0],
-    'BD' => ['name' => 'Bangladesh', 'latitude' => 24.0, 'longitude' => 90.0],
-    'BG' => ['name' => 'Bulgaria', 'latitude' => 43.0, 'longitude' => 25.0],
-    'BH' => ['name' => 'Bahrain', 'latitude' => 26.0, 'longitude' => 50.5],
-    'BS' => ['name' => 'Bahamas', 'latitude' => 24.25, 'longitude' => -76.0],
-    'BA' => ['name' => 'Bosnia and Herzegovina', 'latitude' => 44.0, 'longitude' => 18.0],
-    'BY' => ['name' => 'Belarus', 'latitude' => 53.0, 'longitude' => 28.0],
-    'BZ' => ['name' => 'Belize', 'latitude' => 17.25, 'longitude' => -88.75],
-    'BO' => ['name' => 'Bolivia', 'latitude' => -17.0, 'longitude' => -65.0],
-    'BR' => ['name' => 'Brazil', 'latitude' => -10.0, 'longitude' => -55.0],
-    'BB' => ['name' => 'Barbados', 'latitude' => 13.17, 'longitude' => -59.53],
-    'BN' => ['name' => 'Brunei', 'latitude' => 4.5, 'longitude' => 114.67],
-    'BT' => ['name' => 'Bhutan', 'latitude' => 27.5, 'longitude' => 90.5],
-    'BW' => ['name' => 'Botswana', 'latitude' => -22.0, 'longitude' => 24.0],
-    'CF' => ['name' => 'Central African Republic', 'latitude' => 7.0, 'longitude' => 21.0],
-    'CA' => ['name' => 'Canada', 'latitude' => 60.0, 'longitude' => -95.0],
-    'CH' => ['name' => 'Switzerland', 'latitude' => 47.0, 'longitude' => 8.0],
-    'CL' => ['name' => 'Chile', 'latitude' => -30.0, 'longitude' => -71.0],
-    'CN' => ['name' => 'China', 'latitude' => 35.0, 'longitude' => 105.0],
-    'CI' => ['name' => 'Côte d\'Ivoire', 'latitude' => 8.0, 'longitude' => -5.0],
-    'CM' => ['name' => 'Cameroon', 'latitude' => 6.0, 'longitude' => 12.0],
-    'CD' => ['name' => 'Democratic Republic of the Congo', 'latitude' => -2.5, 'longitude' => 23.5],
-    'CG' => ['name' => 'Republic of the Congo', 'latitude' => -1.0, 'longitude' => 15.0],
-    'CO' => ['name' => 'Colombia', 'latitude' => 4.0, 'longitude' => -72.0],
-    'KM' => ['name' => 'Comoros', 'latitude' => -12.17, 'longitude' => 44.25],
-    'CV' => ['name' => 'Cape Verde', 'latitude' => 16.0, 'longitude' => -24.0],
-    'CR' => ['name' => 'Costa Rica', 'latitude' => 10.0, 'longitude' => -84.0],
-    'CU' => ['name' => 'Cuba', 'latitude' => 21.5, 'longitude' => -80.0],
-    'CY' => ['name' => 'Cyprus', 'latitude' => 35.0, 'longitude' => 33.0],
-    'CZ' => ['name' => 'Czech Republic', 'latitude' => 49.75, 'longitude' => 15.5],
-    'DE' => ['name' => 'Germany', 'latitude' => 51.0, 'longitude' => 9.0],
-    'DJ' => ['name' => 'Djibouti', 'latitude' => 11.5, 'longitude' => 43.0],
-    'DM' => ['name' => 'Dominica', 'latitude' => 15.42, 'longitude' => -61.33],
-    'DK' => ['name' => 'Denmark', 'latitude' => 56.0, 'longitude' => 10.0],
-    'DO' => ['name' => 'Dominican Republic', 'latitude' => 19.0, 'longitude' => -70.67],
-    'DZ' => ['name' => 'Algeria', 'latitude' => 28.0, 'longitude' => 3.0],
-    'EC' => ['name' => 'Ecuador', 'latitude' => -2.0, 'longitude' => -77.5],
-    'EG' => ['name' => 'Egypt', 'latitude' => 27.0, 'longitude' => 30.0],
-    'ER' => ['name' => 'Eritrea', 'latitude' => 15.0, 'longitude' => 39.0],
-    'ES' => ['name' => 'Spain', 'latitude' => 40.0, 'longitude' => -4.0],
-    'EE' => ['name' => 'Estonia', 'latitude' => 59.0, 'longitude' => 26.0],
-    'ET' => ['name' => 'Ethiopia', 'latitude' => 8.0, 'longitude' => 38.0],
-    'FI' => ['name' => 'Finland', 'latitude' => 64.0, 'longitude' => 26.0],
-    'FJ' => ['name' => 'Fiji', 'latitude' => -18.0, 'longitude' => 175.0],
-    'FR' => ['name' => 'France', 'latitude' => 46.0, 'longitude' => 2.0],
-    'FM' => ['name' => 'Micronesia', 'latitude' => 6.92, 'longitude' => 158.25],
-    'GA' => ['name' => 'Gabon', 'latitude' => -1.0, 'longitude' => 11.75],
-    'GB' => ['name' => 'United Kingdom', 'latitude' => 54.0, 'longitude' => -2.0],
-    'GE' => ['name' => 'Georgia', 'latitude' => 42.0, 'longitude' => 43.5],
-    'GH' => ['name' => 'Ghana', 'latitude' => 8.0, 'longitude' => -2.0],
-    'GN' => ['name' => 'Guinea', 'latitude' => 11.0, 'longitude' => -10.0],
-    'GM' => ['name' => 'Gambia', 'latitude' => 13.47, 'longitude' => -16.57],
-    'GW' => ['name' => 'Guinea-Bissau', 'latitude' => 12.0, 'longitude' => -15.0],
-    'GQ' => ['name' => 'Equatorial Guinea', 'latitude' => 2.0, 'longitude' => 10.0],
-    'GR' => ['name' => 'Greece', 'latitude' => 39.0, 'longitude' => 22.0],
-    'GD' => ['name' => 'Grenada', 'latitude' => 12.12, 'longitude' => -61.67],
-    'GT' => ['name' => 'Guatemala', 'latitude' => 15.5, 'longitude' => -90.25],
-    'GY' => ['name' => 'Guyana', 'latitude' => 5.0, 'longitude' => -59.0],
-    'HK' => ['name' => 'Hong Kong', 'latitude' => 22.25, 'longitude' => 114.17],
-    'HN' => ['name' => 'Honduras', 'latitude' => 15.0, 'longitude' => -86.5],
-    'HR' => ['name' => 'Croatia', 'latitude' => 45.17, 'longitude' => 15.5],
-    'HT' => ['name' => 'Haiti', 'latitude' => 19.0, 'longitude' => -72.42],
-    'HU' => ['name' => 'Hungary', 'latitude' => 47.0, 'longitude' => 20.0],
-    'ID' => ['name' => 'Indonesia', 'latitude' => -5.0, 'longitude' => 120.0],
-    'IN' => ['name' => 'India', 'latitude' => 20.0, 'longitude' => 77.0],
-    'IE' => ['name' => 'Ireland', 'latitude' => 53.0, 'longitude' => -8.0],
-    'IR' => ['name' => 'Iran', 'latitude' => 32.0, 'longitude' => 53.0],
-    'IQ' => ['name' => 'Iraq', 'latitude' => 33.0, 'longitude' => 44.0],
-    'IS' => ['name' => 'Iceland', 'latitude' => 65.0, 'longitude' => -18.0],
-    'IL' => ['name' => 'Israel', 'latitude' => 31.5, 'longitude' => 34.75],
-    'IT' => ['name' => 'Italy', 'latitude' => 42.83, 'longitude' => 12.83],
-    'JM' => ['name' => 'Jamaica', 'latitude' => 18.25, 'longitude' => -77.5],
-    'JO' => ['name' => 'Jordan', 'latitude' => 31.0, 'longitude' => 36.0],
-    'JP' => ['name' => 'Japan', 'latitude' => 36.0, 'longitude' => 138.0],
-    'KZ' => ['name' => 'Kazakhstan', 'latitude' => 48.0, 'longitude' => 68.0],
-    'KE' => ['name' => 'Kenya', 'latitude' => 1.0, 'longitude' => 38.0],
-    'KG' => ['name' => 'Kyrgyzstan', 'latitude' => 41.0, 'longitude' => 75.0],
-    'KH' => ['name' => 'Cambodia', 'latitude' => 13.0, 'longitude' => 105.0],
-    'KI' => ['name' => 'Kiribati', 'latitude' => 1.42, 'longitude' => 173.0],
-    'KN' => ['name' => 'Saint Kitts and Nevis', 'latitude' => 17.33, 'longitude' => -62.75],
-    'KR' => ['name' => 'South Korea', 'latitude' => 37.0, 'longitude' => 127.5],
-    'KW' => ['name' => 'Kuwait', 'latitude' => 29.34, 'longitude' => 47.66],
-    'LA' => ['name' => 'Laos', 'latitude' => 18.0, 'longitude' => 105.0],
-    'LB' => ['name' => 'Lebanon', 'latitude' => 33.83, 'longitude' => 35.83],
-    'LR' => ['name' => 'Liberia', 'latitude' => 6.5, 'longitude' => -9.5],
-    'LY' => ['name' => 'Libya', 'latitude' => 25.0, 'longitude' => 17.0],
-    'LC' => ['name' => 'Saint Lucia', 'latitude' => 13.88, 'longitude' => -61.13],
-    'LI' => ['name' => 'Liechtenstein', 'latitude' => 47.17, 'longitude' => 9.53],
-    'LK' => ['name' => 'Sri Lanka', 'latitude' => 7.0, 'longitude' => 81.0],
-    'LS' => ['name' => 'Lesotho', 'latitude' => -29.5, 'longitude' => 28.5],
-    'LT' => ['name' => 'Lithuania', 'latitude' => 56.0, 'longitude' => 24.0],
-    'LU' => ['name' => 'Luxembourg', 'latitude' => 49.75, 'longitude' => 6.17],
-    'LV' => ['name' => 'latitudevia', 'latitude' => 57.0, 'longitude' => 25.0],
-    'MA' => ['name' => 'Morocco', 'latitude' => 32.0, 'longitude' => -5.0],
-    'MC' => ['name' => 'Monaco', 'latitude' => 43.73, 'longitude' => 7.4],
-    'MD' => ['name' => 'Moldova', 'latitude' => 47.0, 'longitude' => 29.0],
-    'MG' => ['name' => 'Madagascar', 'latitude' => -20.0, 'longitude' => 47.0],
-    'MV' => ['name' => 'Maldives', 'latitude' => 3.25, 'longitude' => 73.0],
-    'MX' => ['name' => 'Mexico', 'latitude' => 23.0, 'longitude' => -102.0],
-    'MH' => ['name' => 'Marshall Islands', 'latitude' => 9.0, 'longitude' => 168.0],
-    'MK' => ['name' => 'North Macedonia', 'latitude' => 41.83, 'longitude' => 22.0],
-    'ML' => ['name' => 'Mali', 'latitude' => 17.0, 'longitude' => -4.0],
-    'MT' => ['name' => 'Malta', 'latitude' => 35.83, 'longitude' => 14.58],
-    'MM' => ['name' => 'Myanmar', 'latitude' => 22.0, 'longitude' => 98.0],
-    'ME' => ['name' => 'Montenegro', 'latitude' => 42.5, 'longitude' => 19.3],
-    'MN' => ['name' => 'Mongolia', 'latitude' => 46.0, 'longitude' => 105.0],
-    'MZ' => ['name' => 'Mozambique', 'latitude' => -18.25, 'longitude' => 35.0],
-    'MR' => ['name' => 'Mauritania', 'latitude' => 20.0, 'longitude' => -12.0],
-    'MU' => ['name' => 'Mauritius', 'latitude' => -20.28, 'longitude' => 57.55],
-    'MW' => ['name' => 'Malawi', 'latitude' => -13.5, 'longitude' => 34.0],
-    'MY' => ['name' => 'Malaysia', 'latitude' => 2.5, 'longitude' => 112.5],
-    'NA' => ['name' => 'Namibia', 'latitude' => -22.0, 'longitude' => 17.0],
-    'NE' => ['name' => 'Niger', 'latitude' => 16.0, 'longitude' => 8.0],
-    'NG' => ['name' => 'Nigeria', 'latitude' => 10.0, 'longitude' => 8.0],
-    'NI' => ['name' => 'Nicaragua', 'latitude' => 13.0, 'longitude' => -85.0],
-    'NL' => ['name' => 'Netherlands', 'latitude' => 52.5, 'longitude' => 5.75],
-    'NO' => ['name' => 'Norway', 'latitude' => 62.0, 'longitude' => 10.0],
-    'NP' => ['name' => 'Nepal', 'latitude' => 28.0, 'longitude' => 84.0],
-    'NR' => ['name' => 'Nauru', 'latitude' => -0.53, 'longitude' => 166.92],
-    'NZ' => ['name' => 'New Zealand', 'latitude' => -41.0, 'longitude' => 174.0],
-    'OM' => ['name' => 'Oman', 'latitude' => 21.0, 'longitude' => 57.0],
-    'PK' => ['name' => 'Pakistan', 'latitude' => 30.0, 'longitude' => 70.0],
-    'PS' => ['name' => 'Palestine', 'latitude' => 31.9, 'longitude' => 35.2],
-    'PA' => ['name' => 'Panama', 'latitude' => 9.0, 'longitude' => -80.0],
-    'PE' => ['name' => 'Peru', 'latitude' => -10.0, 'longitude' => -76.0],
-    'PH' => ['name' => 'Philippines', 'latitude' => 13.0, 'longitude' => 122.0],
-    'PW' => ['name' => 'Palau', 'latitude' => 7.5, 'longitude' => 134.5],
-    'PG' => ['name' => 'Papua New Guinea', 'latitude' => -6.0, 'longitude' => 147.0],
-    'PL' => ['name' => 'Poland', 'latitude' => 52.0, 'longitude' => 20.0],
-    'KP' => ['name' => 'North Korea', 'latitude' => 40.0, 'longitude' => 127.0],
-    'PT' => ['name' => 'Portugal', 'latitude' => 39.5, 'longitude' => -8.0],
-    'PY' => ['name' => 'Paraguay', 'latitude' => -23.0, 'longitude' => -58.0],
-    'QA' => ['name' => 'Qatar', 'latitude' => 25.5, 'longitude' => 51.25],
-    'RO' => ['name' => 'Romania', 'latitude' => 46.0, 'longitude' => 25.0],
-    'RU' => ['name' => 'Russia', 'latitude' => 60.0, 'longitude' => 100.0],
-    'RW' => ['name' => 'Rwanda', 'latitude' => -2.0, 'longitude' => 30.0],
-    'SA' => ['name' => 'Saudi Arabia', 'latitude' => 25.0, 'longitude' => 45.0],
-    'SD' => ['name' => 'Sudan', 'latitude' => 15.0, 'longitude' => 30.0],
-    'SN' => ['name' => 'Senegal', 'latitude' => 14.0, 'longitude' => -14.0],
-    'SG' => ['name' => 'Singapore', 'latitude' => 1.37, 'longitude' => 103.8],
-    'SB' => ['name' => 'Solomon Islands', 'latitude' => -8.0, 'longitude' => 159.0],
-    'SL' => ['name' => 'Sierra Leone', 'latitude' => 8.5, 'longitude' => -11.5],
-    'SV' => ['name' => 'El Salvador', 'latitude' => 13.83, 'longitude' => -88.92],
-    'SM' => ['name' => 'San Marino', 'latitude' => 43.77, 'longitude' => 12.42],
-    'SO' => ['name' => 'Somalia', 'latitude' => 10.0, 'longitude' => 49.0],
-    'RS' => ['name' => 'Serbia', 'latitude' => 44.0, 'longitude' => 21.0],
-    'SS' => ['name' => 'South Sudan', 'latitude' => 8.0, 'longitude' => 30.0],
-    'ST' => ['name' => 'São Tomé and Príncipe', 'latitude' => 1.0, 'longitude' => 7.0],
-    'SR' => ['name' => 'Suriname', 'latitude' => 4.0, 'longitude' => -56.0],
-    'SK' => ['name' => 'Slovakia', 'latitude' => 48.67, 'longitude' => 19.5],
-    'SI' => ['name' => 'Slovenia', 'latitude' => 46.0, 'longitude' => 15.0],
-    'SE' => ['name' => 'Sweden', 'latitude' => 62.0, 'longitude' => 15.0],
-    'SZ' => ['name' => 'Eswatini', 'latitude' => -26.5, 'longitude' => 31.5],
-    'SC' => ['name' => 'Seychelles', 'latitude' => -4.58, 'longitude' => 55.67],
-    'SY' => ['name' => 'Syria', 'latitude' => 35.0, 'longitude' => 38.0],
-    'TD' => ['name' => 'Chad', 'latitude' => 15.0, 'longitude' => 19.0],
-    'TG' => ['name' => 'Togo', 'latitude' => 8.0, 'longitude' => 1.17],
-    'TH' => ['name' => 'Thailand', 'latitude' => 15.0, 'longitude' => 100.0],
-    'TJ' => ['name' => 'Tajikistan', 'latitude' => 39.0, 'longitude' => 71.0],
-    'TM' => ['name' => 'Turkmenistan', 'latitude' => 40.0, 'longitude' => 60.0],
-    'TL' => ['name' => 'Timor-Leste', 'latitude' => -8.83, 'longitude' => 125.92],
-    'TO' => ['name' => 'Tonga', 'latitude' => -20.0, 'longitude' => -175.0],
-    'TT' => ['name' => 'Trinidad and Tobago', 'latitude' => 11.0, 'longitude' => -61.0],
-    'TN' => ['name' => 'Tunisia', 'latitude' => 34.0, 'longitude' => 9.0],
-    'TR' => ['name' => 'Turkey', 'latitude' => 39.0, 'longitude' => 35.0],
-    'TV' => ['name' => 'Tuvalu', 'latitude' => -8.0, 'longitude' => 178.0],
-    'TZ' => ['name' => 'Tanzania', 'latitude' => -6.0, 'longitude' => 35.0],
-    'TW' => ['name' => 'Taiwan', 'latitude' => 23.5, 'longitude' => 121.0],
-    'UG' => ['name' => 'Uganda', 'latitude' => 1.0, 'longitude' => 32.0],
-    'UA' => ['name' => 'Ukraine', 'latitude' => 49.0, 'longitude' => 32.0],
-    'UY' => ['name' => 'Uruguay', 'latitude' => -33.0, 'longitude' => -56.0],
-    'US' => ['name' => 'United States', 'latitude' => 38.0, 'longitude' => -97.0],
-    'UZ' => ['name' => 'Uzbekistan', 'latitude' => 41.0, 'longitude' => 64.0],
-    'VA' => ['name' => 'Vatican City', 'latitude' => 41.9, 'longitude' => 12.45],
-    'VC' => ['name' => 'Saint Vincent and the Grenadines', 'latitude' => 13.25, 'longitude' => -61.2],
-    'VE' => ['name' => 'Venezuela', 'latitude' => 8.0, 'longitude' => -66.0],
-    'VN' => ['name' => 'Vietnam', 'latitude' => 16.0, 'longitude' => 106.0],
-    'VU' => ['name' => 'Vanuatu', 'latitude' => -16.0, 'longitude' => 167.0],
-    'WS' => ['name' => 'Samoa', 'latitude' => -13.58, 'longitude' => -172.33],
-    'YE' => ['name' => 'Yemen', 'latitude' => 15.0, 'longitude' => 48.0],
-    'ZA' => ['name' => 'South Africa', 'latitude' => -29.0, 'longitude' => 24.0],
-    'ZM' => ['name' => 'Zambia', 'latitude' => -15.0, 'longitude' => 30.0],
-    'ZW' => ['name' => 'Zimbabwe', 'latitude' => -20.0, 'longitude' => 30.0],
+    'AF',
+    'AO',
+    'AL',
+    'AD',
+    'AE',
+    'AR',
+    'AM',
+    'AG',
+    'AU',
+    'AT',
+    'AZ',
+    'BI',
+    'BE',
+    'BJ',
+    'BF',
+    'BD',
+    'BG',
+    'BH',
+    'BS',
+    'BA',
+    'BY',
+    'BZ',
+    'BO',
+    'BR',
+    'BB',
+    'BN',
+    'BT',
+    'BW',
+    'CF',
+    'CA',
+    'CH',
+    'CL',
+    'CN',
+    'CI',
+    'CM',
+    'CD',
+    'CG',
+    'CO',
+    'KM',
+    'CV',
+    'CR',
+    'CU',
+    'CY',
+    'CZ',
+    'DE',
+    'DJ',
+    'DM',
+    'DK',
+    'DO',
+    'DZ',
+    'EC',
+    'EG',
+    'ER',
+    'ES',
+    'EE',
+    'ET',
+    'FI',
+    'FJ',
+    'FR',
+    'FM',
+    'GA',
+    'GB',
+    'GE',
+    'GH',
+    'GN',
+    'GM',
+    'GW',
+    'GQ',
+    'GR',
+    'GD',
+    'GT',
+    'GY',
+    'HK',
+    'HN',
+    'HR',
+    'HT',
+    'HU',
+    'ID',
+    'IN',
+    'IE',
+    'IR',
+    'IQ',
+    'IS',
+    'IL',
+    'IT',
+    'JM',
+    'JO',
+    'JP',
+    'KZ',
+    'KE',
+    'KG',
+    'KH',
+    'KI',
+    'KN',
+    'KR',
+    'KW',
+    'LA',
+    'LB',
+    'LR',
+    'LY',
+    'LC',
+    'LI',
+    'LK',
+    'LS',
+    'LT',
+    'LU',
+    'LV',
+    'MA',
+    'MC',
+    'MD',
+    'MG',
+    'MV',
+    'MX',
+    'MH',
+    'MK',
+    'ML',
+    'MT',
+    'MM',
+    'ME',
+    'MN',
+    'MZ',
+    'MR',
+    'MU',
+    'MW',
+    'MY',
+    'NA',
+    'NE',
+    'NG',
+    'NI',
+    'NL',
+    'NO',
+    'NP',
+    'NR',
+    'NZ',
+    'OM',
+    'PK',
+    'PS',
+    'PA',
+    'PE',
+    'PH',
+    'PW',
+    'PG',
+    'PL',
+    'KP',
+    'PT',
+    'PY',
+    'QA',
+    'RO',
+    'RU',
+    'RW',
+    'SA',
+    'SD',
+    'SN',
+    'SG',
+    'SB',
+    'SL',
+    'SV',
+    'SM',
+    'SO',
+    'RS',
+    'SS',
+    'ST',
+    'SR',
+    'SK',
+    'SI',
+    'SE',
+    'SZ',
+    'SC',
+    'SY',
+    'TD',
+    'TG',
+    'TH',
+    'TJ',
+    'TM',
+    'TL',
+    'TO',
+    'TT',
+    'TN',
+    'TR',
+    'TV',
+    'TZ',
+    'TW',
+    'UG',
+    'UA',
+    'UY',
+    'US',
+    'UZ',
+    'VA',
+    'VC',
+    'VE',
+    'VN',
+    'VU',
+    'WS',
+    'YE',
+    'ZA',
+    'ZM',
+    'ZW',
 ];
@@ -11,7 +11,7 @@ return [
            [
                'key' => 'web',
                'name' => 'Web',
-                'version' => '17.0.1',
+                'version' => '16.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-web',
                'package' => 'https://www.npmjs.com/package/appwrite',
                'enabled' => true,
@@ -59,7 +59,7 @@ return [
            [
                'key' => 'flutter',
                'name' => 'Flutter',
-                'version' => '15.0.0',
+                'version' => '13.1.1',
                'url' => 'https://github.com/appwrite/sdk-for-flutter',
                'package' => 'https://pub.dev/packages/appwrite',
                'enabled' => true,
@@ -77,7 +77,7 @@ return [
            [
                'key' => 'apple',
                'name' => 'Apple',
-                'version' => '9.0.0',
+                'version' => '7.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-apple',
                'package' => 'https://github.com/appwrite/sdk-for-apple',
                'enabled' => true,
@@ -134,7 +134,7 @@ return [
            [
                'key' => 'react-native',
                'name' => 'React Native',
-                'version' => '0.7.1',
+                'version' => '0.6.0',
                'url' => 'https://github.com/appwrite/sdk-for-react-native',
                'package' => 'https://npmjs.com/package/react-native-appwrite',
                'enabled' => true,
@@ -217,7 +217,7 @@ return [
            [
                'key' => 'cli',
                'name' => 'Command Line',
-                'version' => '6.2.2',
+                'version' => '6.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-cli',
                'package' => 'https://www.npmjs.com/package/appwrite-cli',
                'enabled' => true,
@@ -245,7 +245,7 @@ return [
            [
                'key' => 'nodejs',
                'name' => 'Node.js',
-                'version' => '15.0.1',
+                'version' => '14.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-node',
                'package' => 'https://www.npmjs.com/package/node-appwrite',
                'enabled' => true,
@@ -299,7 +299,7 @@ return [
            [
                'key' => 'python',
                'name' => 'Python',
-                'version' => '9.0.2',
+                'version' => '6.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-python',
                'package' => 'https://pypi.org/project/appwrite/',
                'enabled' => true,
@@ -371,7 +371,7 @@ return [
            [
                'key' => 'dart',
                'name' => 'Dart',
-                'version' => '14.0.0',
+                'version' => '12.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-dart',
                'package' => 'https://pub.dev/packages/dart_appwrite',
                'enabled' => true,
@@ -411,7 +411,7 @@ return [
            [
                'key' => 'swift',
                'name' => 'Swift',
-                'version' => '8.0.0',
+                'version' => '6.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-swift',
                'package' => 'https://github.com/appwrite/sdk-for-swift',
                'enabled' => true,
@@ -3,8 +3,72 @@
 return [
    'default' => [
        '$id' => 'default',
-        'name' => 'default',
+        'name' => 'Frankfurt',
        'disabled' => false,
+        'flag' => 'de',
+        'default' => true,
+    ],
+    'fra' => [
+        '$id' => 'fra',
+        'name' => 'Frankfurt',
+        'disabled' => false,
+        'flag' => 'de',
+        'default' => true,
+    ],
+    'nyc' => [
+        '$id' => 'nyc',
+        'name' => 'New York',
+        'disabled' => true,
+        'flag' => 'us',
+        'default' => true,
+    ],
+    'sfo' => [
+        '$id' => 'sfo',
+        'name' => 'San Francisco',
+        'disabled' => true,
+        'flag' => 'us',
+        'default' => true,
+    ],
+    'blr' => [
+        '$id' => 'blr',
+        'name' => 'Bengaluru',
+        'disabled' => true,
+        'flag' => 'in',
+        'default' => true,
+    ],
+    'lon' => [
+        '$id' => 'lon',
+        'name' => 'London',
+        'disabled' => true,
+        'flag' => 'gb',
+        'default' => true,
+    ],
+    'ams' => [
+        '$id' => 'ams',
+        'name' => 'Amsterdam',
+        'disabled' => true,
+        'flag' => 'nl',
+        'default' => true,
+    ],
+    'sgp' => [
+        '$id' => 'sgp',
+        'name' => 'Singapore',
+        'disabled' => true,
+        'flag' => 'sg',
+        'default' => true,
+    ],
+    'tor' => [
+        '$id' => 'tor',
+        'name' => 'Toronto',
+        'disabled' => true,
+        'flag' => 'ca',
+        'default' => true,
+    ],
+    'syd' => [
+        '$id' => 'syd',
+        'name' => 'Sydney',
+        'disabled' => true,
+        'flag' => 'au',
        'default' => true,
    ],
 ];
@@ -26,6 +26,7 @@ $member = [
    'subscribers.write',
    'subscribers.read',
    'assistant.read',
+    'rules.read'
 ];

 $admins = [
@@ -58,6 +59,10 @@ $admins = [
    'health.read',
    'functions.read',
    'functions.write',
+    'sites.read',
+    'sites.write',
+    'log.read',
+    'log.write',
    'execution.read',
    'execution.write',
    'rules.read',
@@ -6,4 +6,4 @@

 use Appwrite\Runtimes\Runtimes;

-return (new Runtimes('v4'))->getAll();
+return (new Runtimes('v4rc'))->getAll();
@@ -64,6 +64,18 @@ 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',
    ],
@@ -173,6 +173,19 @@ 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',
@@ -0,0 +1,377 @@
+<?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,
+    ],
+];
+
+function getFramework(string $frameworkEnum, array $overrides)
+{
+    $settings = \array_merge(TEMPLATE_FRAMEWORKS[$frameworkEnum], $overrides);
+    return $settings;
+}
+
+return [
+    [
+        '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-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' => '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' => 'nextjs-starter',
+        'name' => 'Next.js starter',
+        'useCases' => ['starter'],
+        'demoImage' => '',
+        'frameworks' => [
+            getFramework('NEXTJS', [
+                'providerRootDirectory' => './nextjs/starter',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.2.*',
+        'variables' => [],
+    ],
+    [
+        'key' => 'nuxt-starter',
+        'name' => 'Nuxt starter',
+        'useCases' => ['starter'],
+        'demoImage' => '',
+        'frameworks' => [
+            getFramework('NUXT', [
+                'providerRootDirectory' => './nuxt/starter',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.2.*',
+        'variables' => [],
+    ],
+    [
+        'key' => 'sveltekit-starter',
+        'name' => 'SvelteKit starter',
+        'useCases' => ['starter'],
+        'demoImage' => '',
+        'frameworks' => [
+            getFramework('SVELTEKIT', [
+                'providerRootDirectory' => './sveltekit/starter',
+            ]),
+        ],
+        'vcsProvider' => 'github',
+        'providerRepositoryId' => 'templates-for-sites',
+        'providerOwner' => 'appwrite',
+        'providerVersion' => '0.2.*',
+        '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' => [],
+    ],
+];
@@ -3383,7 +3383,7 @@
                "parameters": [
                    {
                        "name": "code",
-                        "description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, union-china-pay, visa, mir, maestro, rupay.",
+                        "description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, union-china-pay, visa, mir, maestro.",
                        "required": true,
                        "schema": {
                            "type": "string",
@@ -3404,8 +3404,7 @@
                                "union-china-pay",
                                "visa",
                                "mir",
-                                "maestro",
-                                "rupay"
+                                "maestro"
                            ],
                            "x-enum-name": "CreditCard",
                            "x-enum-keys": [
@@ -3424,8 +3423,7 @@
                                "Union China Pay",
                                "Visa",
                                "MIR",
-                                "Maestro",
-                                "Rupay"
+                                "Maestro"
                            ]
                        },
                        "in": "path"
@@ -4367,7 +4365,7 @@
                "tags": [
                    "databases"
                ],
-                "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console.\n",
+                "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console.",
                "responses": {
                    "201": {
                        "description": "Document",
@@ -3387,7 +3387,7 @@
                "parameters": [
                    {
                        "name": "code",
-                        "description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, union-china-pay, visa, mir, maestro, rupay.",
+                        "description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, union-china-pay, visa, mir, maestro.",
                        "required": true,
                        "schema": {
                            "type": "string",
@@ -3408,8 +3408,7 @@
                                "union-china-pay",
                                "visa",
                                "mir",
-                                "maestro",
-                                "rupay"
+                                "maestro"
                            ],
                            "x-enum-name": "CreditCard",
                            "x-enum-keys": [
@@ -3428,8 +3427,7 @@
                                "Union China Pay",
                                "Visa",
                                "MIR",
-                                "Maestro",
-                                "Rupay"
+                                "Maestro"
                            ]
                        },
                        "in": "path"
@@ -6409,6 +6407,8 @@
                                },
                                "required": [
                                    "required",
+                                    "min",
+                                    "max",
                                    "default"
                                ]
                            }
@@ -6644,6 +6644,8 @@
                                },
                                "required": [
                                    "required",
+                                    "min",
+                                    "max",
                                    "default"
                                ]
                            }
@@ -7821,7 +7823,7 @@
                "tags": [
                    "databases"
                ],
-                "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console.\n",
+                "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console.",
                "responses": {
                    "201": {
                        "description": "Document",
@@ -11583,7 +11585,7 @@
                },
                "x-appwrite": {
                    "method": "getCertificate",
-                    "weight": 133,
+                    "weight": 134,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11690,7 +11692,7 @@
                },
                "x-appwrite": {
                    "method": "getPubSub",
-                    "weight": 129,
+                    "weight": 130,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11716,6 +11718,54 @@
                ]
            }
        },
+        "\/health\/queue": {
+            "get": {
+                "summary": "Get queue",
+                "operationId": "healthGetQueue",
+                "tags": [
+                    "health"
+                ],
+                "description": "Check the Appwrite queue messaging servers are up and connection is successful.",
+                "responses": {
+                    "200": {
+                        "description": "Health Status",
+                        "content": {
+                            "application\/json": {
+                                "schema": {
+                                    "$ref": "#\/components\/schemas\/healthStatus"
+                                }
+                            }
+                        }
+                    }
+                },
+                "x-appwrite": {
+                    "method": "getQueue",
+                    "weight": 129,
+                    "cookies": false,
+                    "type": "",
+                    "deprecated": false,
+                    "demo": "health\/get-queue.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue.md",
+                    "rate-limit": 0,
+                    "rate-time": 3600,
+                    "rate-key": "url:{url},ip:{ip}",
+                    "scope": "health.read",
+                    "platforms": [
+                        "server"
+                    ],
+                    "packaging": false,
+                    "auth": {
+                        "Project": []
+                    }
+                },
+                "security": [
+                    {
+                        "Project": [],
+                        "Key": []
+                    }
+                ]
+            }
+        },
        "\/health\/queue\/builds": {
            "get": {
                "summary": "Get builds queue",
@@ -11738,7 +11788,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueBuilds",
-                    "weight": 135,
+                    "weight": 136,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11799,7 +11849,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueCertificates",
-                    "weight": 134,
+                    "weight": 135,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11860,7 +11910,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueDatabases",
-                    "weight": 136,
+                    "weight": 137,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11932,7 +11982,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueDeletes",
-                    "weight": 137,
+                    "weight": 138,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -12031,9 +12081,8 @@
                                "v1-audits",
                                "v1-mails",
                                "v1-functions",
-                                "v1-stats-resources",
-                                "v1-stats-usage",
-                                "v1-stats-usage-dump",
+                                "v1-usage",
+                                "v1-usage-dump",
                                "v1-webhooks",
                                "v1-certificates",
                                "v1-builds",
@@ -12081,7 +12130,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueFunctions",
-                    "weight": 141,
+                    "weight": 142,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -12142,7 +12191,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueLogs",
-                    "weight": 132,
+                    "weight": 133,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -12203,7 +12252,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueMails",
-                    "weight": 138,
+                    "weight": 139,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -12264,7 +12313,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueMessaging",
-                    "weight": 139,
+                    "weight": 140,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -12325,7 +12374,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueMigrations",
-                    "weight": 140,
+                    "weight": 141,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -12364,70 +12413,9 @@
                ]
            }
        },
-        "\/health\/queue\/stats-resources": {
+        "\/health\/queue\/usage": {
            "get": {
-                "summary": "Get stats  resources queue",
-                "operationId": "healthGetQueueStatsResources",
-                "tags": [
-                    "health"
-                ],
-                "description": "Get the number of metrics that are waiting to be processed in the Appwrite stats resources queue.",
-                "responses": {
-                    "200": {
-                        "description": "Health Queue",
-                        "content": {
-                            "application\/json": {
-                                "schema": {
-                                    "$ref": "#\/components\/schemas\/healthQueue"
-                                }
-                            }
-                        }
-                    }
-                },
-                "x-appwrite": {
-                    "method": "getQueueStatsResources",
-                    "weight": 142,
-                    "cookies": false,
-                    "type": "",
-                    "deprecated": false,
-                    "demo": "health\/get-queue-stats-resources.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-stats-resources.md",
-                    "rate-limit": 0,
-                    "rate-time": 3600,
-                    "rate-key": "url:{url},ip:{ip}",
-                    "scope": "health.read",
-                    "platforms": [
-                        "server"
-                    ],
-                    "packaging": false,
-                    "auth": {
-                        "Project": []
-                    }
-                },
-                "security": [
-                    {
-                        "Project": [],
-                        "Key": []
-                    }
-                ],
-                "parameters": [
-                    {
-                        "name": "threshold",
-                        "description": "Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.",
-                        "required": false,
-                        "schema": {
-                            "type": "integer",
-                            "format": "int32",
-                            "default": 5000
-                        },
-                        "in": "query"
-                    }
-                ]
-            }
-        },
-        "\/health\/queue\/stats-usage": {
-            "get": {
-                "summary": "Get stats usage queue",
+                "summary": "Get usage queue",
                "operationId": "healthGetQueueUsage",
                "tags": [
                    "health"
@@ -12452,7 +12440,7 @@
                    "type": "",
                    "deprecated": false,
                    "demo": "health\/get-queue-usage.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-stats-usage.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-usage.md",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -12486,10 +12474,10 @@
                ]
            }
        },
-        "\/health\/queue\/stats-usage-dump": {
+        "\/health\/queue\/usage-dump": {
            "get": {
                "summary": "Get usage dump queue",
-                "operationId": "healthGetQueueStatsUsageDump",
+                "operationId": "healthGetQueueUsageDump",
                "tags": [
                    "health"
                ],
@@ -12507,13 +12495,13 @@
                    }
                },
                "x-appwrite": {
-                    "method": "getQueueStatsUsageDump",
+                    "method": "getQueueUsageDump",
                    "weight": 144,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
-                    "demo": "health\/get-queue-stats-usage-dump.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-stats-usage-dump.md",
+                    "demo": "health\/get-queue-usage-dump.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-usage-dump.md",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -12569,7 +12557,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueWebhooks",
-                    "weight": 131,
+                    "weight": 132,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -12726,7 +12714,7 @@
                },
                "x-appwrite": {
                    "method": "getTime",
-                    "weight": 130,
+                    "weight": 131,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -17621,17 +17609,17 @@
                                    },
                                    "endpoint": {
                                        "type": "string",
-                                        "description": "Source Appwrite endpoint",
+                                        "description": "Source's Appwrite Endpoint",
                                        "x-example": "https:\/\/example.com"
                                    },
                                    "projectId": {
                                        "type": "string",
-                                        "description": "Source Project ID",
+                                        "description": "Source's Project ID",
                                        "x-example": "<PROJECT_ID>"
                                    },
                                    "apiKey": {
                                        "type": "string",
-                                        "description": "Source API Key",
+                                        "description": "Source's API Key",
                                        "x-example": "<API_KEY>"
                                    }
                                },
@@ -36064,20 +36052,6 @@
                            "$ref": "#\/components\/schemas\/metric"
                        },
                        "x-example": []
-                    },
-                    "imageTransformations": {
-                        "type": "array",
-                        "description": "Aggregated number of files transformations per period.",
-                        "items": {
-                            "$ref": "#\/components\/schemas\/metric"
-                        },
-                        "x-example": []
-                    },
-                    "imageTransformationsTotal": {
-                        "type": "integer",
-                        "description": "Total aggregated number of files transformations.",
-                        "x-example": 0,
-                        "format": "int32"
                    }
                },
                "required": [
@@ -36085,9 +36059,7 @@
                    "filesTotal",
                    "filesStorageTotal",
                    "files",
-                    "storage",
-                    "imageTransformations",
-                    "imageTransformationsTotal"
+                    "storage"
                ]
            },
            "usageFunctions": {
@@ -36625,20 +36597,6 @@
                            "$ref": "#\/components\/schemas\/metric"
                        },
                        "x-example": []
-                    },
-                    "imageTransformations": {
-                        "type": "array",
-                        "description": "An array of aggregated number of image transformations.",
-                        "items": {
-                            "$ref": "#\/components\/schemas\/metric"
-                        },
-                        "x-example": []
-                    },
-                    "imageTransformationsTotal": {
-                        "type": "integer",
-                        "description": "Total aggregated number of image transformations.",
-                        "x-example": 0,
-                        "format": "int32"
                    }
                },
                "required": [
@@ -36670,9 +36628,7 @@
                    "authPhoneEstimate",
                    "authPhoneCountryBreakdown",
                    "databasesReads",
-                    "databasesWrites",
-                    "imageTransformations",
-                    "imageTransformationsTotal"
+                    "databasesWrites"
                ]
            },
            "headers": {
@@ -3077,7 +3077,7 @@
                "parameters": [
                    {
                        "name": "code",
-                        "description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, union-china-pay, visa, mir, maestro, rupay.",
+                        "description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, union-china-pay, visa, mir, maestro.",
                        "required": true,
                        "schema": {
                            "type": "string",
@@ -3098,8 +3098,7 @@
                                "union-china-pay",
                                "visa",
                                "mir",
-                                "maestro",
-                                "rupay"
+                                "maestro"
                            ],
                            "x-enum-name": "CreditCard",
                            "x-enum-keys": [
@@ -3118,8 +3117,7 @@
                                "Union China Pay",
                                "Visa",
                                "MIR",
-                                "Maestro",
-                                "Rupay"
+                                "Maestro"
                            ]
                        },
                        "in": "path"
@@ -5953,6 +5951,8 @@
                                },
                                "required": [
                                    "required",
+                                    "min",
+                                    "max",
                                    "default"
                                ]
                            }
@@ -6190,6 +6190,8 @@
                                },
                                "required": [
                                    "required",
+                                    "min",
+                                    "max",
                                    "default"
                                ]
                            }
@@ -7379,7 +7381,7 @@
                "tags": [
                    "databases"
                ],
-                "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console.\n",
+                "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console.",
                "responses": {
                    "201": {
                        "description": "Document",
@@ -10459,7 +10461,7 @@
                },
                "x-appwrite": {
                    "method": "getCertificate",
-                    "weight": 133,
+                    "weight": 134,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -10568,7 +10570,7 @@
                },
                "x-appwrite": {
                    "method": "getPubSub",
-                    "weight": 129,
+                    "weight": 130,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -10595,6 +10597,55 @@
                ]
            }
        },
+        "\/health\/queue": {
+            "get": {
+                "summary": "Get queue",
+                "operationId": "healthGetQueue",
+                "tags": [
+                    "health"
+                ],
+                "description": "Check the Appwrite queue messaging servers are up and connection is successful.",
+                "responses": {
+                    "200": {
+                        "description": "Health Status",
+                        "content": {
+                            "application\/json": {
+                                "schema": {
+                                    "$ref": "#\/components\/schemas\/healthStatus"
+                                }
+                            }
+                        }
+                    }
+                },
+                "x-appwrite": {
+                    "method": "getQueue",
+                    "weight": 129,
+                    "cookies": false,
+                    "type": "",
+                    "deprecated": false,
+                    "demo": "health\/get-queue.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue.md",
+                    "rate-limit": 0,
+                    "rate-time": 3600,
+                    "rate-key": "url:{url},ip:{ip}",
+                    "scope": "health.read",
+                    "platforms": [
+                        "server"
+                    ],
+                    "packaging": false,
+                    "auth": {
+                        "Project": [],
+                        "Key": []
+                    }
+                },
+                "security": [
+                    {
+                        "Project": [],
+                        "Key": []
+                    }
+                ]
+            }
+        },
        "\/health\/queue\/builds": {
            "get": {
                "summary": "Get builds queue",
@@ -10617,7 +10668,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueBuilds",
-                    "weight": 135,
+                    "weight": 136,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -10679,7 +10730,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueCertificates",
-                    "weight": 134,
+                    "weight": 135,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -10741,7 +10792,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueDatabases",
-                    "weight": 136,
+                    "weight": 137,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -10814,7 +10865,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueDeletes",
-                    "weight": 137,
+                    "weight": 138,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -10915,9 +10966,8 @@
                                "v1-audits",
                                "v1-mails",
                                "v1-functions",
-                                "v1-stats-resources",
-                                "v1-stats-usage",
-                                "v1-stats-usage-dump",
+                                "v1-usage",
+                                "v1-usage-dump",
                                "v1-webhooks",
                                "v1-certificates",
                                "v1-builds",
@@ -10965,7 +11015,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueFunctions",
-                    "weight": 141,
+                    "weight": 142,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11027,7 +11077,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueLogs",
-                    "weight": 132,
+                    "weight": 133,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11089,7 +11139,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueMails",
-                    "weight": 138,
+                    "weight": 139,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11151,7 +11201,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueMessaging",
-                    "weight": 139,
+                    "weight": 140,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11213,7 +11263,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueMigrations",
-                    "weight": 140,
+                    "weight": 141,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11253,71 +11303,9 @@
                ]
            }
        },
-        "\/health\/queue\/stats-resources": {
+        "\/health\/queue\/usage": {
            "get": {
-                "summary": "Get stats  resources queue",
-                "operationId": "healthGetQueueStatsResources",
-                "tags": [
-                    "health"
-                ],
-                "description": "Get the number of metrics that are waiting to be processed in the Appwrite stats resources queue.",
-                "responses": {
-                    "200": {
-                        "description": "Health Queue",
-                        "content": {
-                            "application\/json": {
-                                "schema": {
-                                    "$ref": "#\/components\/schemas\/healthQueue"
-                                }
-                            }
-                        }
-                    }
-                },
-                "x-appwrite": {
-                    "method": "getQueueStatsResources",
-                    "weight": 142,
-                    "cookies": false,
-                    "type": "",
-                    "deprecated": false,
-                    "demo": "health\/get-queue-stats-resources.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-stats-resources.md",
-                    "rate-limit": 0,
-                    "rate-time": 3600,
-                    "rate-key": "url:{url},ip:{ip}",
-                    "scope": "health.read",
-                    "platforms": [
-                        "server"
-                    ],
-                    "packaging": false,
-                    "auth": {
-                        "Project": [],
-                        "Key": []
-                    }
-                },
-                "security": [
-                    {
-                        "Project": [],
-                        "Key": []
-                    }
-                ],
-                "parameters": [
-                    {
-                        "name": "threshold",
-                        "description": "Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.",
-                        "required": false,
-                        "schema": {
-                            "type": "integer",
-                            "format": "int32",
-                            "default": 5000
-                        },
-                        "in": "query"
-                    }
-                ]
-            }
-        },
-        "\/health\/queue\/stats-usage": {
-            "get": {
-                "summary": "Get stats usage queue",
+                "summary": "Get usage queue",
                "operationId": "healthGetQueueUsage",
                "tags": [
                    "health"
@@ -11342,7 +11330,7 @@
                    "type": "",
                    "deprecated": false,
                    "demo": "health\/get-queue-usage.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-stats-usage.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-usage.md",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -11377,10 +11365,10 @@
                ]
            }
        },
-        "\/health\/queue\/stats-usage-dump": {
+        "\/health\/queue\/usage-dump": {
            "get": {
                "summary": "Get usage dump queue",
-                "operationId": "healthGetQueueStatsUsageDump",
+                "operationId": "healthGetQueueUsageDump",
                "tags": [
                    "health"
                ],
@@ -11398,13 +11386,13 @@
                    }
                },
                "x-appwrite": {
-                    "method": "getQueueStatsUsageDump",
+                    "method": "getQueueUsageDump",
                    "weight": 144,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
-                    "demo": "health\/get-queue-stats-usage-dump.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-stats-usage-dump.md",
+                    "demo": "health\/get-queue-usage-dump.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-usage-dump.md",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -11461,7 +11449,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueWebhooks",
-                    "weight": 131,
+                    "weight": 132,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11621,7 +11609,7 @@
                },
                "x-appwrite": {
                    "method": "getTime",
-                    "weight": 130,
+                    "weight": 131,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1,7 +1,7 @@
 {
    "openapi": "3.0.0",
    "info": {
-        "version": "1.6.1",
+        "version": "1.7.0",
        "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",
@@ -3383,7 +3383,7 @@
                "parameters": [
                    {
                        "name": "code",
-                        "description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, union-china-pay, visa, mir, maestro, rupay.",
+                        "description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, union-china-pay, visa, mir, maestro.",
                        "required": true,
                        "schema": {
                            "type": "string",
@@ -3404,8 +3404,7 @@
                                "union-china-pay",
                                "visa",
                                "mir",
-                                "maestro",
-                                "rupay"
+                                "maestro"
                            ],
                            "x-enum-name": "CreditCard",
                            "x-enum-keys": [
@@ -3424,8 +3423,7 @@
                                "Union China Pay",
                                "Visa",
                                "MIR",
-                                "Maestro",
-                                "Rupay"
+                                "Maestro"
                            ]
                        },
                        "in": "path"
@@ -4367,7 +4365,7 @@
                "tags": [
                    "databases"
                ],
-                "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console.\n",
+                "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console.",
                "responses": {
                    "201": {
                        "description": "Document",
@@ -4763,7 +4761,7 @@
                },
                "x-appwrite": {
                    "method": "listExecutions",
-                    "weight": 306,
+                    "weight": 300,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -4848,7 +4846,7 @@
                },
                "x-appwrite": {
                    "method": "createExecution",
-                    "weight": 305,
+                    "weight": 299,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -4962,7 +4960,7 @@
                },
                "x-appwrite": {
                    "method": "getExecution",
-                    "weight": 307,
+                    "weight": 301,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5035,7 +5033,7 @@
                },
                "x-appwrite": {
                    "method": "query",
-                    "weight": 331,
+                    "weight": 326,
                    "cookies": false,
                    "type": "graphql",
                    "deprecated": false,
@@ -5086,7 +5084,7 @@
                },
                "x-appwrite": {
                    "method": "mutation",
-                    "weight": 330,
+                    "weight": 325,
                    "cookies": false,
                    "type": "graphql",
                    "deprecated": false,
@@ -5545,7 +5543,7 @@
                },
                "x-appwrite": {
                    "method": "createSubscriber",
-                    "weight": 376,
+                    "weight": 371,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5627,7 +5625,7 @@
                },
                "x-appwrite": {
                    "method": "deleteSubscriber",
-                    "weight": 380,
+                    "weight": 375,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5701,7 +5699,7 @@
                },
                "x-appwrite": {
                    "method": "listFiles",
-                    "weight": 208,
+                    "weight": 207,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5786,7 +5784,7 @@
                },
                "x-appwrite": {
                    "method": "createFile",
-                    "weight": 207,
+                    "weight": 206,
                    "cookies": false,
                    "type": "upload",
                    "deprecated": false,
@@ -5883,7 +5881,7 @@
                },
                "x-appwrite": {
                    "method": "getFile",
-                    "weight": 209,
+                    "weight": 208,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5954,7 +5952,7 @@
                },
                "x-appwrite": {
                    "method": "updateFile",
-                    "weight": 214,
+                    "weight": 213,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6042,7 +6040,7 @@
                },
                "x-appwrite": {
                    "method": "deleteFile",
-                    "weight": 215,
+                    "weight": 214,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6108,7 +6106,7 @@
                },
                "x-appwrite": {
                    "method": "getFileDownload",
-                    "weight": 211,
+                    "weight": 210,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -6174,7 +6172,7 @@
                },
                "x-appwrite": {
                    "method": "getFilePreview",
-                    "weight": 210,
+                    "weight": 209,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -6390,7 +6388,7 @@
                },
                "x-appwrite": {
                    "method": "getFileView",
-                    "weight": 212,
+                    "weight": 211,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -6463,7 +6461,7 @@
                },
                "x-appwrite": {
                    "method": "list",
-                    "weight": 219,
+                    "weight": 218,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6538,7 +6536,7 @@
                },
                "x-appwrite": {
                    "method": "create",
-                    "weight": 218,
+                    "weight": 217,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6622,7 +6620,7 @@
                },
                "x-appwrite": {
                    "method": "get",
-                    "weight": 220,
+                    "weight": 219,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6683,7 +6681,7 @@
                },
                "x-appwrite": {
                    "method": "updateName",
-                    "weight": 222,
+                    "weight": 221,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6756,7 +6754,7 @@
                },
                "x-appwrite": {
                    "method": "delete",
-                    "weight": 224,
+                    "weight": 223,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6819,7 +6817,7 @@
                },
                "x-appwrite": {
                    "method": "listMemberships",
-                    "weight": 226,
+                    "weight": 225,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6904,7 +6902,7 @@
                },
                "x-appwrite": {
                    "method": "createMembership",
-                    "weight": 225,
+                    "weight": 224,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7014,7 +7012,7 @@
                },
                "x-appwrite": {
                    "method": "getMembership",
-                    "weight": 227,
+                    "weight": 226,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7085,7 +7083,7 @@
                },
                "x-appwrite": {
                    "method": "updateMembership",
-                    "weight": 228,
+                    "weight": 227,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7171,7 +7169,7 @@
                },
                "x-appwrite": {
                    "method": "deleteMembership",
-                    "weight": 230,
+                    "weight": 229,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7244,7 +7242,7 @@
                },
                "x-appwrite": {
                    "method": "updateMembershipStatus",
-                    "weight": 229,
+                    "weight": 228,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7341,7 +7339,7 @@
                },
                "x-appwrite": {
                    "method": "getPrefs",
-                    "weight": 221,
+                    "weight": 220,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7401,7 +7399,7 @@
                },
                "x-appwrite": {
                    "method": "updatePrefs",
-                    "weight": 223,
+                    "weight": 222,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7514,6 +7512,11 @@
            "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.",
@@ -9143,7 +9146,7 @@
                    },
                    "duration": {
                        "type": "number",
-                        "description": "Function execution duration in seconds.",
+                        "description": "Resource(function\/site) execution duration in seconds.",
                        "x-example": 0.4,
                        "format": "double"
                    },
@@ -3557,7 +3557,7 @@
                "parameters": [
                    {
                        "name": "code",
-                        "description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, union-china-pay, visa, mir, maestro, rupay.",
+                        "description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, union-china-pay, visa, mir, maestro.",
                        "required": true,
                        "type": "string",
                        "x-example": "amex",
@@ -3577,8 +3577,7 @@
                            "union-china-pay",
                            "visa",
                            "mir",
-                            "maestro",
-                            "rupay"
+                            "maestro"
                        ],
                        "x-enum-name": "CreditCard",
                        "x-enum-keys": [
@@ -3597,8 +3596,7 @@
                            "Union China Pay",
                            "Visa",
                            "MIR",
-                            "Maestro",
-                            "Rupay"
+                            "Maestro"
                        ],
                        "in": "path"
                    },
@@ -4549,7 +4547,7 @@
                "tags": [
                    "databases"
                ],
-                "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console.\n",
+                "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console.",
                "responses": {
                    "201": {
                        "description": "Document",
@@ -3577,7 +3577,7 @@
                "parameters": [
                    {
                        "name": "code",
-                        "description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, union-china-pay, visa, mir, maestro, rupay.",
+                        "description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, union-china-pay, visa, mir, maestro.",
                        "required": true,
                        "type": "string",
                        "x-example": "amex",
@@ -3597,8 +3597,7 @@
                            "union-china-pay",
                            "visa",
                            "mir",
-                            "maestro",
-                            "rupay"
+                            "maestro"
                        ],
                        "x-enum-name": "CreditCard",
                        "x-enum-keys": [
@@ -3617,8 +3616,7 @@
                            "Union China Pay",
                            "Visa",
                            "MIR",
-                            "Maestro",
-                            "Rupay"
+                            "Maestro"
                        ],
                        "in": "path"
                    },
@@ -6609,6 +6607,8 @@
                            },
                            "required": [
                                "required",
+                                "min",
+                                "max",
                                "default"
                            ]
                        }
@@ -6845,6 +6845,8 @@
                            },
                            "required": [
                                "required",
+                                "min",
+                                "max",
                                "default"
                            ]
                        }
@@ -8010,7 +8012,7 @@
                "tags": [
                    "databases"
                ],
-                "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console.\n",
+                "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console.",
                "responses": {
                    "201": {
                        "description": "Document",
@@ -11808,7 +11810,7 @@
                },
                "x-appwrite": {
                    "method": "getCertificate",
-                    "weight": 133,
+                    "weight": 134,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11917,7 +11919,7 @@
                },
                "x-appwrite": {
                    "method": "getPubSub",
-                    "weight": 129,
+                    "weight": 130,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11943,6 +11945,56 @@
                ]
            }
        },
+        "\/health\/queue": {
+            "get": {
+                "summary": "Get queue",
+                "operationId": "healthGetQueue",
+                "consumes": [
+                    "application\/json"
+                ],
+                "produces": [
+                    "application\/json"
+                ],
+                "tags": [
+                    "health"
+                ],
+                "description": "Check the Appwrite queue messaging servers are up and connection is successful.",
+                "responses": {
+                    "200": {
+                        "description": "Health Status",
+                        "schema": {
+                            "$ref": "#\/definitions\/healthStatus"
+                        }
+                    }
+                },
+                "x-appwrite": {
+                    "method": "getQueue",
+                    "weight": 129,
+                    "cookies": false,
+                    "type": "",
+                    "deprecated": false,
+                    "demo": "health\/get-queue.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue.md",
+                    "rate-limit": 0,
+                    "rate-time": 3600,
+                    "rate-key": "url:{url},ip:{ip}",
+                    "scope": "health.read",
+                    "platforms": [
+                        "server"
+                    ],
+                    "packaging": false,
+                    "auth": {
+                        "Project": []
+                    }
+                },
+                "security": [
+                    {
+                        "Project": [],
+                        "Key": []
+                    }
+                ]
+            }
+        },
        "\/health\/queue\/builds": {
            "get": {
                "summary": "Get builds queue",
@@ -11967,7 +12019,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueBuilds",
-                    "weight": 135,
+                    "weight": 136,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -12028,7 +12080,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueCertificates",
-                    "weight": 134,
+                    "weight": 135,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -12089,7 +12141,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueDatabases",
-                    "weight": 136,
+                    "weight": 137,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -12159,7 +12211,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueDeletes",
-                    "weight": 137,
+                    "weight": 138,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -12257,9 +12309,8 @@
                            "v1-audits",
                            "v1-mails",
                            "v1-functions",
-                            "v1-stats-resources",
-                            "v1-stats-usage",
-                            "v1-stats-usage-dump",
+                            "v1-usage",
+                            "v1-usage-dump",
                            "v1-webhooks",
                            "v1-certificates",
                            "v1-builds",
@@ -12306,7 +12357,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueFunctions",
-                    "weight": 141,
+                    "weight": 142,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -12367,7 +12418,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueLogs",
-                    "weight": 132,
+                    "weight": 133,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -12428,7 +12479,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueMails",
-                    "weight": 138,
+                    "weight": 139,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -12489,7 +12540,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueMessaging",
-                    "weight": 139,
+                    "weight": 140,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -12550,7 +12601,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueMigrations",
-                    "weight": 140,
+                    "weight": 141,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -12587,70 +12638,9 @@
                ]
            }
        },
-        "\/health\/queue\/stats-resources": {
+        "\/health\/queue\/usage": {
            "get": {
-                "summary": "Get stats  resources queue",
-                "operationId": "healthGetQueueStatsResources",
-                "consumes": [
-                    "application\/json"
-                ],
-                "produces": [
-                    "application\/json"
-                ],
-                "tags": [
-                    "health"
-                ],
-                "description": "Get the number of metrics that are waiting to be processed in the Appwrite stats resources queue.",
-                "responses": {
-                    "200": {
-                        "description": "Health Queue",
-                        "schema": {
-                            "$ref": "#\/definitions\/healthQueue"
-                        }
-                    }
-                },
-                "x-appwrite": {
-                    "method": "getQueueStatsResources",
-                    "weight": 142,
-                    "cookies": false,
-                    "type": "",
-                    "deprecated": false,
-                    "demo": "health\/get-queue-stats-resources.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-stats-resources.md",
-                    "rate-limit": 0,
-                    "rate-time": 3600,
-                    "rate-key": "url:{url},ip:{ip}",
-                    "scope": "health.read",
-                    "platforms": [
-                        "server"
-                    ],
-                    "packaging": false,
-                    "auth": {
-                        "Project": []
-                    }
-                },
-                "security": [
-                    {
-                        "Project": [],
-                        "Key": []
-                    }
-                ],
-                "parameters": [
-                    {
-                        "name": "threshold",
-                        "description": "Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.",
-                        "required": false,
-                        "type": "integer",
-                        "format": "int32",
-                        "default": 5000,
-                        "in": "query"
-                    }
-                ]
-            }
-        },
-        "\/health\/queue\/stats-usage": {
-            "get": {
-                "summary": "Get stats usage queue",
+                "summary": "Get usage queue",
                "operationId": "healthGetQueueUsage",
                "consumes": [
                    "application\/json"
@@ -12677,7 +12667,7 @@
                    "type": "",
                    "deprecated": false,
                    "demo": "health\/get-queue-usage.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-stats-usage.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-usage.md",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -12709,10 +12699,10 @@
                ]
            }
        },
-        "\/health\/queue\/stats-usage-dump": {
+        "\/health\/queue\/usage-dump": {
            "get": {
                "summary": "Get usage dump queue",
-                "operationId": "healthGetQueueStatsUsageDump",
+                "operationId": "healthGetQueueUsageDump",
                "consumes": [
                    "application\/json"
                ],
@@ -12732,13 +12722,13 @@
                    }
                },
                "x-appwrite": {
-                    "method": "getQueueStatsUsageDump",
+                    "method": "getQueueUsageDump",
                    "weight": 144,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
-                    "demo": "health\/get-queue-stats-usage-dump.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-stats-usage-dump.md",
+                    "demo": "health\/get-queue-usage-dump.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-usage-dump.md",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -12794,7 +12784,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueWebhooks",
-                    "weight": 131,
+                    "weight": 132,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -12955,7 +12945,7 @@
                },
                "x-appwrite": {
                    "method": "getTime",
-                    "weight": 130,
+                    "weight": 131,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -18080,19 +18070,19 @@
                                },
                                "endpoint": {
                                    "type": "string",
-                                    "description": "Source Appwrite endpoint",
+                                    "description": "Source's Appwrite Endpoint",
                                    "default": null,
                                    "x-example": "https:\/\/example.com"
                                },
                                "projectId": {
                                    "type": "string",
-                                    "description": "Source Project ID",
+                                    "description": "Source's Project ID",
                                    "default": null,
                                    "x-example": "<PROJECT_ID>"
                                },
                                "apiKey": {
                                    "type": "string",
-                                    "description": "Source API Key",
+                                    "description": "Source's API Key",
                                    "default": null,
                                    "x-example": "<API_KEY>"
                                }
@@ -36618,21 +36608,6 @@
                        "$ref": "#\/definitions\/metric"
                    },
                    "x-example": []
-                },
-                "imageTransformations": {
-                    "type": "array",
-                    "description": "Aggregated number of files transformations per period.",
-                    "items": {
-                        "type": "object",
-                        "$ref": "#\/definitions\/metric"
-                    },
-                    "x-example": []
-                },
-                "imageTransformationsTotal": {
-                    "type": "integer",
-                    "description": "Total aggregated number of files transformations.",
-                    "x-example": 0,
-                    "format": "int32"
                }
            },
            "required": [
@@ -36640,9 +36615,7 @@
                "filesTotal",
                "filesStorageTotal",
                "files",
-                "storage",
-                "imageTransformations",
-                "imageTransformationsTotal"
+                "storage"
            ]
        },
        "usageFunctions": {
@@ -37212,21 +37185,6 @@
                        "$ref": "#\/definitions\/metric"
                    },
                    "x-example": []
-                },
-                "imageTransformations": {
-                    "type": "array",
-                    "description": "An array of aggregated number of image transformations.",
-                    "items": {
-                        "type": "object",
-                        "$ref": "#\/definitions\/metric"
-                    },
-                    "x-example": []
-                },
-                "imageTransformationsTotal": {
-                    "type": "integer",
-                    "description": "Total aggregated number of image transformations.",
-                    "x-example": 0,
-                    "format": "int32"
                }
            },
            "required": [
@@ -37258,9 +37216,7 @@
                "authPhoneEstimate",
                "authPhoneCountryBreakdown",
                "databasesReads",
-                "databasesWrites",
-                "imageTransformations",
-                "imageTransformationsTotal"
+                "databasesWrites"
            ]
        },
        "headers": {
@@ -3261,7 +3261,7 @@
                "parameters": [
                    {
                        "name": "code",
-                        "description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, union-china-pay, visa, mir, maestro, rupay.",
+                        "description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, union-china-pay, visa, mir, maestro.",
                        "required": true,
                        "type": "string",
                        "x-example": "amex",
@@ -3281,8 +3281,7 @@
                            "union-china-pay",
                            "visa",
                            "mir",
-                            "maestro",
-                            "rupay"
+                            "maestro"
                        ],
                        "x-enum-name": "CreditCard",
                        "x-enum-keys": [
@@ -3301,8 +3300,7 @@
                            "Union China Pay",
                            "Visa",
                            "MIR",
-                            "Maestro",
-                            "Rupay"
+                            "Maestro"
                        ],
                        "in": "path"
                    },
@@ -6135,6 +6133,8 @@
                            },
                            "required": [
                                "required",
+                                "min",
+                                "max",
                                "default"
                            ]
                        }
@@ -6373,6 +6373,8 @@
                            },
                            "required": [
                                "required",
+                                "min",
+                                "max",
                                "default"
                            ]
                        }
@@ -7550,7 +7552,7 @@
                "tags": [
                    "databases"
                ],
-                "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console.\n",
+                "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console.",
                "responses": {
                    "201": {
                        "description": "Document",
@@ -10687,7 +10689,7 @@
                },
                "x-appwrite": {
                    "method": "getCertificate",
-                    "weight": 133,
+                    "weight": 134,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -10798,7 +10800,7 @@
                },
                "x-appwrite": {
                    "method": "getPubSub",
-                    "weight": 129,
+                    "weight": 130,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -10825,6 +10827,57 @@
                ]
            }
        },
+        "\/health\/queue": {
+            "get": {
+                "summary": "Get queue",
+                "operationId": "healthGetQueue",
+                "consumes": [
+                    "application\/json"
+                ],
+                "produces": [
+                    "application\/json"
+                ],
+                "tags": [
+                    "health"
+                ],
+                "description": "Check the Appwrite queue messaging servers are up and connection is successful.",
+                "responses": {
+                    "200": {
+                        "description": "Health Status",
+                        "schema": {
+                            "$ref": "#\/definitions\/healthStatus"
+                        }
+                    }
+                },
+                "x-appwrite": {
+                    "method": "getQueue",
+                    "weight": 129,
+                    "cookies": false,
+                    "type": "",
+                    "deprecated": false,
+                    "demo": "health\/get-queue.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue.md",
+                    "rate-limit": 0,
+                    "rate-time": 3600,
+                    "rate-key": "url:{url},ip:{ip}",
+                    "scope": "health.read",
+                    "platforms": [
+                        "server"
+                    ],
+                    "packaging": false,
+                    "auth": {
+                        "Project": [],
+                        "Key": []
+                    }
+                },
+                "security": [
+                    {
+                        "Project": [],
+                        "Key": []
+                    }
+                ]
+            }
+        },
        "\/health\/queue\/builds": {
            "get": {
                "summary": "Get builds queue",
@@ -10849,7 +10902,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueBuilds",
-                    "weight": 135,
+                    "weight": 136,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -10911,7 +10964,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueCertificates",
-                    "weight": 134,
+                    "weight": 135,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -10973,7 +11026,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueDatabases",
-                    "weight": 136,
+                    "weight": 137,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11044,7 +11097,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueDeletes",
-                    "weight": 137,
+                    "weight": 138,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11144,9 +11197,8 @@
                            "v1-audits",
                            "v1-mails",
                            "v1-functions",
-                            "v1-stats-resources",
-                            "v1-stats-usage",
-                            "v1-stats-usage-dump",
+                            "v1-usage",
+                            "v1-usage-dump",
                            "v1-webhooks",
                            "v1-certificates",
                            "v1-builds",
@@ -11193,7 +11245,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueFunctions",
-                    "weight": 141,
+                    "weight": 142,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11255,7 +11307,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueLogs",
-                    "weight": 132,
+                    "weight": 133,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11317,7 +11369,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueMails",
-                    "weight": 138,
+                    "weight": 139,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11379,7 +11431,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueMessaging",
-                    "weight": 139,
+                    "weight": 140,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11441,7 +11493,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueMigrations",
-                    "weight": 140,
+                    "weight": 141,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11479,71 +11531,9 @@
                ]
            }
        },
-        "\/health\/queue\/stats-resources": {
+        "\/health\/queue\/usage": {
            "get": {
-                "summary": "Get stats  resources queue",
-                "operationId": "healthGetQueueStatsResources",
-                "consumes": [
-                    "application\/json"
-                ],
-                "produces": [
-                    "application\/json"
-                ],
-                "tags": [
-                    "health"
-                ],
-                "description": "Get the number of metrics that are waiting to be processed in the Appwrite stats resources queue.",
-                "responses": {
-                    "200": {
-                        "description": "Health Queue",
-                        "schema": {
-                            "$ref": "#\/definitions\/healthQueue"
-                        }
-                    }
-                },
-                "x-appwrite": {
-                    "method": "getQueueStatsResources",
-                    "weight": 142,
-                    "cookies": false,
-                    "type": "",
-                    "deprecated": false,
-                    "demo": "health\/get-queue-stats-resources.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-stats-resources.md",
-                    "rate-limit": 0,
-                    "rate-time": 3600,
-                    "rate-key": "url:{url},ip:{ip}",
-                    "scope": "health.read",
-                    "platforms": [
-                        "server"
-                    ],
-                    "packaging": false,
-                    "auth": {
-                        "Project": [],
-                        "Key": []
-                    }
-                },
-                "security": [
-                    {
-                        "Project": [],
-                        "Key": []
-                    }
-                ],
-                "parameters": [
-                    {
-                        "name": "threshold",
-                        "description": "Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.",
-                        "required": false,
-                        "type": "integer",
-                        "format": "int32",
-                        "default": 5000,
-                        "in": "query"
-                    }
-                ]
-            }
-        },
-        "\/health\/queue\/stats-usage": {
-            "get": {
-                "summary": "Get stats usage queue",
+                "summary": "Get usage queue",
                "operationId": "healthGetQueueUsage",
                "consumes": [
                    "application\/json"
@@ -11570,7 +11560,7 @@
                    "type": "",
                    "deprecated": false,
                    "demo": "health\/get-queue-usage.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-stats-usage.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-usage.md",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -11603,10 +11593,10 @@
                ]
            }
        },
-        "\/health\/queue\/stats-usage-dump": {
+        "\/health\/queue\/usage-dump": {
            "get": {
                "summary": "Get usage dump queue",
-                "operationId": "healthGetQueueStatsUsageDump",
+                "operationId": "healthGetQueueUsageDump",
                "consumes": [
                    "application\/json"
                ],
@@ -11626,13 +11616,13 @@
                    }
                },
                "x-appwrite": {
-                    "method": "getQueueStatsUsageDump",
+                    "method": "getQueueUsageDump",
                    "weight": 144,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
-                    "demo": "health\/get-queue-stats-usage-dump.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-stats-usage-dump.md",
+                    "demo": "health\/get-queue-usage-dump.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/health\/get-queue-usage-dump.md",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -11689,7 +11679,7 @@
                },
                "x-appwrite": {
                    "method": "getQueueWebhooks",
-                    "weight": 131,
+                    "weight": 132,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -11853,7 +11843,7 @@
                },
                "x-appwrite": {
                    "method": "getTime",
-                    "weight": 130,
+                    "weight": 131,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1,7 +1,7 @@
 {
    "swagger": "2.0",
    "info": {
-        "version": "1.6.1",
+        "version": "1.7.0",
        "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",
@@ -3557,7 +3557,7 @@
                "parameters": [
                    {
                        "name": "code",
-                        "description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, union-china-pay, visa, mir, maestro, rupay.",
+                        "description": "Credit Card Code. Possible values: amex, argencard, cabal, cencosud, diners, discover, elo, hipercard, jcb, mastercard, naranja, targeta-shopping, union-china-pay, visa, mir, maestro.",
                        "required": true,
                        "type": "string",
                        "x-example": "amex",
@@ -3577,8 +3577,7 @@
                            "union-china-pay",
                            "visa",
                            "mir",
-                            "maestro",
-                            "rupay"
+                            "maestro"
                        ],
                        "x-enum-name": "CreditCard",
                        "x-enum-keys": [
@@ -3597,8 +3596,7 @@
                            "Union China Pay",
                            "Visa",
                            "MIR",
-                            "Maestro",
-                            "Rupay"
+                            "Maestro"
                        ],
                        "in": "path"
                    },
@@ -4549,7 +4547,7 @@
                "tags": [
                    "databases"
                ],
-                "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console.\n",
+                "description": "Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https:\/\/appwrite.io\/docs\/server\/databases#databasesCreateCollection) API or directly from your database console.",
                "responses": {
                    "201": {
                        "description": "Document",
@@ -4929,7 +4927,7 @@
                },
                "x-appwrite": {
                    "method": "listExecutions",
-                    "weight": 306,
+                    "weight": 300,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5011,7 +5009,7 @@
                },
                "x-appwrite": {
                    "method": "createExecution",
-                    "weight": 305,
+                    "weight": 299,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5129,7 +5127,7 @@
                },
                "x-appwrite": {
                    "method": "getExecution",
-                    "weight": 307,
+                    "weight": 301,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5200,7 +5198,7 @@
                },
                "x-appwrite": {
                    "method": "query",
-                    "weight": 331,
+                    "weight": 326,
                    "cookies": false,
                    "type": "graphql",
                    "deprecated": false,
@@ -5273,7 +5271,7 @@
                },
                "x-appwrite": {
                    "method": "mutation",
-                    "weight": 330,
+                    "weight": 325,
                    "cookies": false,
                    "type": "graphql",
                    "deprecated": false,
@@ -5770,7 +5768,7 @@
                },
                "x-appwrite": {
                    "method": "createSubscriber",
-                    "weight": 376,
+                    "weight": 371,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5854,7 +5852,7 @@
                },
                "x-appwrite": {
                    "method": "deleteSubscriber",
-                    "weight": 380,
+                    "weight": 375,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5926,7 +5924,7 @@
                },
                "x-appwrite": {
                    "method": "listFiles",
-                    "weight": 208,
+                    "weight": 207,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6008,7 +6006,7 @@
                },
                "x-appwrite": {
                    "method": "createFile",
-                    "weight": 207,
+                    "weight": 206,
                    "cookies": false,
                    "type": "upload",
                    "deprecated": false,
@@ -6099,7 +6097,7 @@
                },
                "x-appwrite": {
                    "method": "getFile",
-                    "weight": 209,
+                    "weight": 208,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6168,7 +6166,7 @@
                },
                "x-appwrite": {
                    "method": "updateFile",
-                    "weight": 214,
+                    "weight": 213,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6256,7 +6254,7 @@
                },
                "x-appwrite": {
                    "method": "deleteFile",
-                    "weight": 215,
+                    "weight": 214,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6327,7 +6325,7 @@
                },
                "x-appwrite": {
                    "method": "getFileDownload",
-                    "weight": 211,
+                    "weight": 210,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -6398,7 +6396,7 @@
                },
                "x-appwrite": {
                    "method": "getFilePreview",
-                    "weight": 210,
+                    "weight": 209,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -6597,7 +6595,7 @@
                },
                "x-appwrite": {
                    "method": "getFileView",
-                    "weight": 212,
+                    "weight": 211,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -6668,7 +6666,7 @@
                },
                "x-appwrite": {
                    "method": "list",
-                    "weight": 219,
+                    "weight": 218,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6742,7 +6740,7 @@
                },
                "x-appwrite": {
                    "method": "create",
-                    "weight": 218,
+                    "weight": 217,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6833,7 +6831,7 @@
                },
                "x-appwrite": {
                    "method": "get",
-                    "weight": 220,
+                    "weight": 219,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6894,7 +6892,7 @@
                },
                "x-appwrite": {
                    "method": "updateName",
-                    "weight": 222,
+                    "weight": 221,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6968,7 +6966,7 @@
                },
                "x-appwrite": {
                    "method": "delete",
-                    "weight": 224,
+                    "weight": 223,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7031,7 +7029,7 @@
                },
                "x-appwrite": {
                    "method": "listMemberships",
-                    "weight": 226,
+                    "weight": 225,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7113,7 +7111,7 @@
                },
                "x-appwrite": {
                    "method": "createMembership",
-                    "weight": 225,
+                    "weight": 224,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7227,7 +7225,7 @@
                },
                "x-appwrite": {
                    "method": "getMembership",
-                    "weight": 227,
+                    "weight": 226,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7296,7 +7294,7 @@
                },
                "x-appwrite": {
                    "method": "updateMembership",
-                    "weight": 228,
+                    "weight": 227,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7381,7 +7379,7 @@
                },
                "x-appwrite": {
                    "method": "deleteMembership",
-                    "weight": 230,
+                    "weight": 229,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7452,7 +7450,7 @@
                },
                "x-appwrite": {
                    "method": "updateMembershipStatus",
-                    "weight": 229,
+                    "weight": 228,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7547,7 +7545,7 @@
                },
                "x-appwrite": {
                    "method": "getPrefs",
-                    "weight": 221,
+                    "weight": 220,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7607,7 +7605,7 @@
                },
                "x-appwrite": {
                    "method": "updatePrefs",
-                    "weight": 223,
+                    "weight": 222,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7717,6 +7715,11 @@
            "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.",
@@ -9332,7 +9335,7 @@
                },
                "duration": {
                    "type": "number",
-                    "description": "Function execution duration in seconds.",
+                    "description": "Resource(function\/site) execution duration in seconds.",
                    "x-example": 0.4,
                    "format": "double"
                },
@@ -0,0 +1,40 @@
+<?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']
+    ],
+];
@@ -572,7 +572,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_S3_ACCESS_KEY',
-                'description' => 'S3 storage access key. Required when the storage adapter is set to S3. You can get your access key from your S3 storage provider',
+                'description' => 'AWS S3 storage access key. Required when the storage adapter is set to S3. You can get your access key from your AWS console',
                'introduction' => '0.13.0',
                'default' => '',
                'required' => false,
@@ -580,7 +580,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_S3_SECRET',
-                'description' => 'S3 storage secret key. Required when the storage adapter is set to S3. You can get your secret key from your S3 storage provider.',
+                'description' => 'AWS S3 storage secret key. Required when the storage adapter is set to S3. You can get your secret key from your AWS console.',
                'introduction' => '0.13.0',
                'default' => '',
                'required' => false,
@@ -588,7 +588,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_S3_REGION',
-                'description' => 'S3 storage region. Required when storage adapter is set to S3. You can find your region info for your bucket from your S3 storage provider.',
+                'description' => 'AWS S3 storage region. Required when storage adapter is set to S3. You can find your region info for your bucket from AWS console.',
                'introduction' => '0.13.0',
                'default' => 'us-east-1',
                'required' => false,
@@ -596,20 +596,12 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_S3_BUCKET',
-                'description' => 'S3 storage bucket. Required when storage adapter is set to S3. You can create buckets in your S3 storage provider.',
+                'description' => 'AWS S3 storage bucket. Required when storage adapter is set to S3. You can create buckets in your AWS console.',
                'introduction' => '0.13.0',
                'default' => '',
                'required' => false,
                'question' => '',
            ],
-            [
-                'name' => '_APP_STORAGE_S3_ENDPOINT',
-                'description' => 'S3 storage endpoint. Required when using S3 storage providers other than AWS.',
-                'introduction' => '0.16.2',
-                'default' => '',
-                'required' => false,
-                'question' => '',
-            ],
            [
                'name' => '_APP_STORAGE_DO_SPACES_ACCESS_KEY',
                'description' => 'DigitalOcean spaces access key. Required when the storage adapter is set to DOSpaces. You can get your access key from your DigitalOcean console.',
@@ -1048,22 +1040,13 @@ return [
            ],
            [
                'name' => '_APP_MAINTENANCE_RETENTION_AUDIT',
-                'description' => 'The maximum duration (in seconds) upto which to retain audit logs. The default value is 1209600 seconds (14 days).',
+                'description' => 'IThe maximum duration (in seconds) upto which to retain audit logs. The default value is 1209600 seconds (14 days).',
                'introduction' => '0.7.0',
                'default' => '1209600',
                'required' => false,
                'question' => '',
                'filter' => ''
            ],
-            [
-                'name' => '_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE',
-                'description' => 'The maximum duration (in seconds) upto which to retain console audit logs. The default value is 15778800 seconds (6 months).',
-                'introduction' => '1.6.2',
-                'default' => '15778800',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
            [
                'name' => '_APP_MAINTENANCE_RETENTION_ABUSE',
                'description' => 'The maximum duration (in seconds) upto which to retain abuse logs. The default value is 86400 seconds (1 day).',
@@ -17,7 +17,7 @@ use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Mail;
 use Appwrite\Event\Messaging;
-use Appwrite\Event\StatsUsage;
+use Appwrite\Event\Usage;
 use Appwrite\Extend\Exception;
 use Appwrite\Hooks\Hooks;
 use Appwrite\Network\Validator\Email;
@@ -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', 'auth'])
+    ->groups(['api', 'account'])
    ->label('scope', 'sessions.write')
    ->label('auth.type', 'phone')
    ->label('audits.event', 'session.create')
@@ -2432,9 +2432,9 @@ App::post('/v1/account/tokens/phone')
    ->inject('queueForMessaging')
    ->inject('locale')
    ->inject('timelimit')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('plan')
-    ->action(function (string $userId, string $phone, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Event $queueForEvents, Messaging $queueForMessaging, Locale $locale, callable $timelimit, StatsUsage $queueForStatsUsage, array $plan) {
+    ->action(function (string $userId, string $phone, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Event $queueForEvents, Messaging $queueForMessaging, Locale $locale, callable $timelimit, Usage $queueForUsage, array $plan) {
        if (empty(System::getEnv('_APP_SMS_PROVIDER'))) {
            throw new Exception(Exception::GENERAL_PHONE_DISABLED, 'Phone provider not configured');
        }
@@ -2583,11 +2583,11 @@ App::post('/v1/account/tokens/phone')
                    $countryCode = $helper->parse($phone)->getCountryCode();

                    if (!empty($countryCode)) {
-                        $queueForStatsUsage
+                        $queueForUsage
                            ->addMetric(str_replace('{countryCode}', $countryCode, METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE), 1);
                    }
                }
-                $queueForStatsUsage
+                $queueForUsage
                    ->addMetric(METRIC_AUTH_METHOD_PHONE, 1)
                    ->setProject($project)
                    ->trigger();
@@ -2715,15 +2715,13 @@ App::get('/v1/account/logs')
            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'))),
-        ]);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
+        $offset = $grouped['offset'] ?? 0;

        $audit = new EventAudit($dbForProject);

-        $logs = $audit->getLogsByUser($user->getInternalId(), $queries);
+        $logs = $audit->getLogsByUser($user->getInternalId(), $limit, $offset);

        $output = [];

@@ -2752,7 +2750,7 @@ App::get('/v1/account/logs')
        }

        $response->dynamic(new Document([
-            'total' => $audit->countLogsByUser($user->getInternalId(), $queries),
+            'total' => $audit->countLogsByUser($user->getInternalId()),
            'logs' => $output,
        ]), Response::MODEL_LOG_LIST);
    });
@@ -3680,9 +3678,9 @@ App::post('/v1/account/verification/phone')
    ->inject('project')
    ->inject('locale')
    ->inject('timelimit')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('plan')
-    ->action(function (Request $request, Response $response, Document $user, Database $dbForProject, Event $queueForEvents, Messaging $queueForMessaging, Document $project, Locale $locale, callable $timelimit, StatsUsage $queueForStatsUsage, array $plan) {
+    ->action(function (Request $request, Response $response, Document $user, Database $dbForProject, Event $queueForEvents, Messaging $queueForMessaging, Document $project, Locale $locale, callable $timelimit, Usage $queueForUsage, array $plan) {
        if (empty(System::getEnv('_APP_SMS_PROVIDER'))) {
            throw new Exception(Exception::GENERAL_PHONE_DISABLED, 'Phone provider not configured');
        }
@@ -3777,11 +3775,11 @@ App::post('/v1/account/verification/phone')
                    $countryCode = $helper->parse($phone)->getCountryCode();

                    if (!empty($countryCode)) {
-                        $queueForStatsUsage
+                        $queueForUsage
                            ->addMetric(str_replace('{countryCode}', $countryCode, METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE), 1);
                    }
                }
-                $queueForStatsUsage
+                $queueForUsage
                    ->addMetric(METRIC_AUTH_METHOD_PHONE, 1)
                    ->setProject($project)
                    ->trigger();
@@ -4312,9 +4310,9 @@ App::post('/v1/account/mfa/challenge')
    ->inject('queueForMessaging')
    ->inject('queueForMails')
    ->inject('timelimit')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('plan')
-    ->action(function (string $factor, Response $response, Database $dbForProject, Document $user, Locale $locale, Document $project, Request $request, Event $queueForEvents, Messaging $queueForMessaging, Mail $queueForMails, callable $timelimit, StatsUsage $queueForStatsUsage, array $plan) {
+    ->action(function (string $factor, Response $response, Database $dbForProject, Document $user, Locale $locale, Document $project, Request $request, Event $queueForEvents, Messaging $queueForMessaging, Mail $queueForMails, callable $timelimit, Usage $queueForUsage, array $plan) {

        $expire = DateTime::addSeconds(new \DateTime(), Auth::TOKEN_EXPIRATION_CONFIRM);
        $code = Auth::codeGenerator();
@@ -4385,11 +4383,11 @@ App::post('/v1/account/mfa/challenge')
                        $countryCode = $helper->parse($phone)->getCountryCode();

                        if (!empty($countryCode)) {
-                            $queueForStatsUsage
+                            $queueForUsage
                                ->addMetric(str_replace('{countryCode}', $countryCode, METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE), 1);
                        }
                    }
-                    $queueForStatsUsage
+                    $queueForUsage
                        ->addMetric(METRIC_AUTH_METHOD_PHONE, 1)
                        ->setProject($project)
                        ->trigger();
@@ -56,11 +56,13 @@ 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_FUNCTIONS_SIZE_LIMIT' => +System::getEnv('_APP_FUNCTIONS_SIZE_LIMIT'),
+            '_APP_COMPUTE_SIZE_LIMIT' => +System::getEnv('_APP_COMPUTE_SIZE_LIMIT'),
            '_APP_USAGE_STATS' => System::getEnv('_APP_USAGE_STATS'),
            '_APP_VCS_ENABLED' => $isVcsEnabled,
            '_APP_DOMAIN_ENABLED' => $isDomainEnabled,
-            '_APP_ASSISTANT_ENABLED' => $isAssistantEnabled
+            '_APP_ASSISTANT_ENABLED' => $isAssistantEnabled,
+            '_APP_DOMAIN_SITES' => System::getEnv('_APP_DOMAIN_SITES'),
+            '_APP_OPTIONS_FORCE_HTTPS' => System::getEnv('_APP_OPTIONS_FORCE_HTTPS')
        ]);

        $response->dynamic($variables, Response::MODEL_CONSOLE_VARIABLES);
@@ -4,7 +4,7 @@ use Appwrite\Auth\Auth;
 use Appwrite\Detector\Detector;
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Event;
-use Appwrite\Event\StatsUsage;
+use Appwrite\Event\Usage;
 use Appwrite\Extend\Exception;
 use Appwrite\Network\Validator\Email;
 use Appwrite\SDK\AuthType;
@@ -20,15 +20,13 @@ use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use MaxMind\Db\Reader;
 use Utopia\App;
-use Utopia\Audit\Adapter\Audit;
+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;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
-use Utopia\Database\Exception\Index as IndexException;
 use Utopia\Database\Exception\Limit as LimitException;
 use Utopia\Database\Exception\NotFound as NotFoundException;
 use Utopia\Database\Exception\Query as QueryException;
@@ -243,8 +241,8 @@ function updateAttribute(
    string $filter = null,
    string|bool|int|float $default = null,
    bool $required = null,
-    int|float|null $min = null,
-    int|float|null $max = null,
+    int|float $min = null,
+    int|float $max = null,
    array $elements = null,
    array $options = [],
    string $newKey = null,
@@ -300,9 +298,6 @@ 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');
            }
@@ -398,8 +393,6 @@ function updateAttribute(
            throw new Exception(Exception::ATTRIBUTE_NOT_FOUND);
        } catch (LimitException) {
            throw new Exception(Exception::ATTRIBUTE_LIMIT_EXCEEDED);
-        } catch (IndexException $e) {
-            throw new Exception(Exception::INDEX_INVALID, $e->getMessage());
        }
    }

@@ -483,8 +476,8 @@ App::post('/v1/databases')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('queueForEvents')
-    ->inject('queueForStatsUsage')
-    ->action(function (string $databaseId, string $name, bool $enabled, Response $response, Database $dbForProject, Event $queueForEvents, StatsUsage $queueForStatsUsage) {
+    ->inject('queueForUsage')
+    ->action(function (string $databaseId, string $name, bool $enabled, Response $response, Database $dbForProject, Event $queueForEvents, Usage $queueForUsage) {

        $databaseId = $databaseId == 'unique()' ? ID::unique() : $databaseId;

@@ -534,7 +527,7 @@ App::post('/v1/databases')
        }

        $queueForEvents->setParam('databaseId', $database->getId());
-        $queueForStatsUsage->addMetric(str_replace(['{databaseInternalId}'], [$database->getInternalId()], METRIC_DATABASE_ID_STORAGE), 1); // per database
+        $queueForUsage->addMetric(str_replace(['{databaseInternalId}'], [$database->getInternalId()], METRIC_DATABASE_ID_STORAGE), 1); // per database

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -673,15 +666,13 @@ App::get('/v1/databases/:databaseId/logs')
            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'))),
-        ]);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
+        $offset = $grouped['offset'] ?? 0;

        $audit = new Audit($dbForProject);
        $resource = 'database/' . $databaseId;
-        $logs = $audit->getLogsByResource($resource, $queries);
+        $logs = $audit->getLogsByResource($resource, $limit, $offset);

        $output = [];

@@ -729,7 +720,7 @@ App::get('/v1/databases/:databaseId/logs')
        }

        $response->dynamic(new Document([
-            'total' => $audit->countLogsByResource($resource, $queries),
+            'total' => $audit->countLogsByResource($resource),
            'logs' => $output,
        ]), Response::MODEL_LOG_LIST);
    });
@@ -806,8 +797,8 @@ App::delete('/v1/databases/:databaseId')
    ->inject('dbForProject')
    ->inject('queueForDatabase')
    ->inject('queueForEvents')
-    ->inject('queueForStatsUsage')
-    ->action(function (string $databaseId, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, StatsUsage $queueForStatsUsage) {
+    ->inject('queueForUsage')
+    ->action(function (string $databaseId, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Usage $queueForUsage) {

        $database = $dbForProject->getDocument('databases', $databaseId);

@@ -830,7 +821,7 @@ App::delete('/v1/databases/:databaseId')
            ->setParam('databaseId', $database->getId())
            ->setPayload($response->output($database, Response::MODEL_DATABASE));

-        $queueForStatsUsage
+        $queueForUsage
            ->addMetric(METRIC_DATABASES_STORAGE, 1); // Global, deletion forces full recalculation

        $response->noContent();
@@ -1063,21 +1054,14 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/logs')
            throw new Exception(Exception::COLLECTION_NOT_FOUND);
        }

-        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'))),
-        ]);
+        $queries = Query::parseQueries($queries);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
+        $offset = $grouped['offset'] ?? 0;

        $audit = new Audit($dbForProject);
        $resource = 'database/' . $databaseId . '/collection/' . $collectionId;
-        $logs = $audit->getLogsByResource($resource, $queries);
+        $logs = $audit->getLogsByResource($resource, $limit, $offset);

        $output = [];

@@ -1125,7 +1109,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/logs')
        }

        $response->dynamic(new Document([
-            'total' => $audit->countLogsByResource($resource, $queries),
+            'total' => $audit->countLogsByResource($resource),
            'logs' => $output,
        ]), Response::MODEL_LOG_LIST);
    });
@@ -1563,8 +1547,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 ??= PHP_INT_MIN;
-        $max ??= PHP_INT_MAX;
+        $min = \is_null($min) ? PHP_INT_MIN : $min;
+        $max = \is_null($max) ? PHP_INT_MAX : $max;

        if ($min > $max) {
            throw new Exception(Exception::ATTRIBUTE_VALUE_INVALID, 'Minimum value must be lesser than maximum value');
@@ -1640,8 +1624,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 ??= -PHP_FLOAT_MAX;
-        $max ??= PHP_FLOAT_MAX;
+        $min = \is_null($min) ? -PHP_FLOAT_MAX : $min;
+        $max = \is_null($max) ? PHP_FLOAT_MAX : $max;

        if ($min > $max) {
            throw new Exception(Exception::ATTRIBUTE_VALUE_INVALID, 'Minimum value must be lesser than maximum value');
@@ -2352,8 +2336,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', true)
-    ->param('max', null, new Integer(), 'Maximum value to enforce on new documents', true)
+    ->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('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')
@@ -2411,8 +2395,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', true)
-    ->param('max', null, new FloatValidator(), 'Maximum value to enforce on new documents', true)
+    ->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('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')
@@ -2634,8 +2618,8 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/attributes/:key
    ->inject('dbForProject')
    ->inject('queueForDatabase')
    ->inject('queueForEvents')
-    ->inject('queueForStatsUsage')
-    ->action(function (string $databaseId, string $collectionId, string $key, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, StatsUsage $queueForStatsUsage) {
+    ->inject('queueForUsage')
+    ->action(function (string $databaseId, string $collectionId, string $key, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Usage $queueForUsage) {

        $db = Authorization::skip(fn () => $dbForProject->getDocument('databases', $databaseId));

@@ -2732,7 +2716,7 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/attributes/:key
            ->setContext('database', $db)
            ->setPayload($response->output($attribute, $model));

-        $queueForStatsUsage
+        $queueForUsage
            ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$db->getInternalId(), $collection->getInternalId()], METRIC_DATABASE_ID_COLLECTION_ID_STORAGE), 1); // per collection

        $response->noContent();
@@ -2838,7 +2822,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')
            $attributeIndex = \array_search($attribute, array_column($oldAttributes, 'key'));

            if ($attributeIndex === false) {
-                throw new Exception(Exception::ATTRIBUTE_UNKNOWN, 'Unknown attribute: ' . $attribute . '. Verify the attribute name or create the attribute.');
+                throw new Exception(Exception::ATTRIBUTE_UNKNOWN, 'Unknown attribute: ' . $attribute);
            }

            $attributeStatus = $oldAttributes[$attributeIndex]['status'];
@@ -3150,8 +3134,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
    ->inject('dbForProject')
    ->inject('user')
    ->inject('queueForEvents')
-    ->inject('queueForStatsUsage')
-    ->action(function (string $databaseId, string $documentId, string $collectionId, string|array $data, ?array $permissions, Response $response, Database $dbForProject, Document $user, Event $queueForEvents, StatsUsage $queueForStatsUsage) {
+    ->inject('queueForUsage')
+    ->inject('mode')
+    ->action(function (string $databaseId, string $documentId, string $collectionId, string|array $data, ?array $permissions, Response $response, Database $dbForProject, Document $user, Event $queueForEvents, Usage $queueForUsage, string $mode) {

        $data = (\is_string($data)) ? \json_decode($data, true) : $data; // Cast to JSON array

@@ -3354,8 +3339,8 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')

        $processDocument($collection, $document);

-        $queueForStatsUsage
-            ->addMetric(METRIC_DATABASES_OPERATIONS_WRITES, max($operations, 1))
+        $queueForUsage
+            ->addMetric(METRIC_DATABASES_OPERATIONS_WRITES, $operations)
            ->addMetric(str_replace('{databaseInternalId}', $database->getInternalId(), METRIC_DATABASE_ID_OPERATIONS_WRITES), $operations)
            ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$database->getInternalId(), $collection->getInternalId()], METRIC_DATABASE_ID_COLLECTION_ID_STORAGE), 1); // per collection

@@ -3406,8 +3391,9 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
    ->param('queries', [], new ArrayList(new Text(APP_LIMIT_ARRAY_ELEMENT_SIZE), APP_LIMIT_ARRAY_PARAMS_SIZE), '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.', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('queueForStatsUsage')
-    ->action(function (string $databaseId, string $collectionId, array $queries, Response $response, Database $dbForProject, StatsUsage $queueForStatsUsage) {
+    ->inject('mode')
+    ->inject('queueForUsage')
+    ->action(function (string $databaseId, string $collectionId, array $queries, Response $response, Database $dbForProject, string $mode, Usage $queueForUsage) {
        $database = Authorization::skip(fn () => $dbForProject->getDocument('databases', $databaseId));
        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
@@ -3519,9 +3505,10 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
            $processDocument($collection, $document);
        }

-        $queueForStatsUsage
-            ->addMetric(METRIC_DATABASES_OPERATIONS_READS, max($operations, 1))
-            ->addMetric(str_replace('{databaseInternalId}', $database->getInternalId(), METRIC_DATABASE_ID_OPERATIONS_READS), $operations);
+        $queueForUsage
+            ->addMetric(METRIC_DATABASES_OPERATIONS_READS, $operations)
+            ->addMetric(str_replace('{databaseInternalId}', $database->getInternalId(), METRIC_DATABASE_ID_OPERATIONS_READS), $operations)
+        ;

        $response->addHeader('X-Debug-Operations', $operations);

@@ -3583,8 +3570,9 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
    ->param('queries', [], new ArrayList(new Text(APP_LIMIT_ARRAY_ELEMENT_SIZE), APP_LIMIT_ARRAY_PARAMS_SIZE), '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.', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('queueForStatsUsage')
-    ->action(function (string $databaseId, string $collectionId, string $documentId, array $queries, Response $response, Database $dbForProject, StatsUsage $queueForStatsUsage) {
+    ->inject('mode')
+    ->inject('queueForUsage')
+    ->action(function (string $databaseId, string $collectionId, string $documentId, array $queries, Response $response, Database $dbForProject, string $mode, Usage $queueForUsage) {
        $database = Authorization::skip(fn () => $dbForProject->getDocument('databases', $databaseId));
        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
@@ -3660,9 +3648,10 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen

        $processDocument($collection, $document);

-        $queueForStatsUsage
-            ->addMetric(METRIC_DATABASES_OPERATIONS_READS, max($operations, 1))
-            ->addMetric(str_replace('{databaseInternalId}', $database->getInternalId(), METRIC_DATABASE_ID_OPERATIONS_READS), $operations);
+        $queueForUsage
+            ->addMetric(METRIC_DATABASES_OPERATIONS_READS, $operations)
+            ->addMetric(str_replace('{databaseInternalId}', $database->getInternalId(), METRIC_DATABASE_ID_OPERATIONS_READS), $operations)
+        ;

        $response->addHeader('X-Debug-Operations', $operations);

@@ -3722,15 +3711,13 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
            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'))),
-        ]);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
+        $offset = $grouped['offset'] ?? 0;

        $audit = new Audit($dbForProject);
        $resource = 'database/' . $databaseId . '/collection/' . $collectionId . '/document/' . $document->getId();
-        $logs = $audit->getLogsByResource($resource, $queries);
+        $logs = $audit->getLogsByResource($resource, $limit, $offset);

        $output = [];

@@ -3778,7 +3765,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
        }

        $response->dynamic(new Document([
-            'total' => $audit->countLogsByResource($resource, $queries),
+            'total' => $audit->countLogsByResource($resource),
            'logs' => $output,
        ]), Response::MODEL_LOG_LIST);
    });
@@ -3817,8 +3804,9 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:docum
    ->inject('response')
    ->inject('dbForProject')
    ->inject('queueForEvents')
-    ->inject('queueForStatsUsage')
-    ->action(function (string $databaseId, string $collectionId, string $documentId, string|array $data, ?array $permissions, ?\DateTime $requestTimestamp, Response $response, Database $dbForProject, Event $queueForEvents, StatsUsage $queueForStatsUsage) {
+    ->inject('mode')
+    ->inject('queueForUsage')
+    ->action(function (string $databaseId, string $collectionId, string $documentId, string|array $data, ?array $permissions, ?\DateTime $requestTimestamp, Response $response, Database $dbForProject, Event $queueForEvents, string $mode, Usage $queueForUsage) {

        $data = (\is_string($data)) ? \json_decode($data, true) : $data; // Cast to JSON array

@@ -3958,9 +3946,10 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:docum

        $setCollection($collection, $newDocument);

-        $queueForStatsUsage
-            ->addMetric(METRIC_DATABASES_OPERATIONS_WRITES, max($operations, 1))
-            ->addMetric(str_replace('{databaseInternalId}', $database->getInternalId(), METRIC_DATABASE_ID_OPERATIONS_WRITES), $operations);
+        $queueForUsage
+            ->addMetric(METRIC_DATABASES_OPERATIONS_WRITES, $operations)
+            ->addMetric(str_replace('{databaseInternalId}', $database->getInternalId(), METRIC_DATABASE_ID_OPERATIONS_WRITES), $operations)
+        ;

        $response->addHeader('X-Debug-Operations', $operations);

@@ -4069,8 +4058,9 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu
    ->inject('response')
    ->inject('dbForProject')
    ->inject('queueForEvents')
-    ->inject('queueForStatsUsage')
-    ->action(function (string $databaseId, string $collectionId, string $documentId, ?\DateTime $requestTimestamp, Response $response, Database $dbForProject, Event $queueForEvents, StatsUsage $queueForStatsUsage) {
+    ->inject('queueForUsage')
+    ->inject('mode')
+    ->action(function (string $databaseId, string $collectionId, string $documentId, ?\DateTime $requestTimestamp, Response $response, Database $dbForProject, Event $queueForEvents, Usage $queueForUsage, string $mode) {
        $database = Authorization::skip(fn () => $dbForProject->getDocument('databases', $databaseId));

        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
@@ -4139,7 +4129,7 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu

        $processDocument($collection, $document);

-        $queueForStatsUsage
+        $queueForUsage
            ->addMetric(METRIC_DATABASES_OPERATIONS_WRITES, 1)
            ->addMetric(str_replace('{databaseInternalId}', $database->getInternalId(), METRIC_DATABASE_ID_OPERATIONS_WRITES), 1)
            ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$database->getInternalId(), $collection->getInternalId()], METRIC_DATABASE_ID_COLLECTION_ID_STORAGE), 1); // per collection
@@ -692,47 +692,15 @@ App::get('/v1/health/queue/functions')
        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
    }, ['response']);

-App::get('/v1/health/queue/stats-resources')
-    ->desc('Get stats  resources queue')
-    ->groups(['api', 'health'])
-    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        name: 'getQueueStatsResources',
-        description: '/docs/references/health/get-queue-stats-resources.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_QUEUE,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
-    ->param('threshold', 5000, new Integer(true), 'Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.', true)
-    ->inject('publisher')
-    ->inject('response')
-    ->action(function (int|string $threshold, Publisher $publisher, Response $response) {
-        $threshold = \intval($threshold);
-
-        $size = $publisher->getQueueSize(new Queue(Event::STATS_RESOURCES_QUEUE_NAME));
-
-        if ($size >= $threshold) {
-            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
-        }
-
-        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    });
-
-App::get('/v1/health/queue/stats-usage')
-    ->desc('Get stats usage queue')
+App::get('/v1/health/queue/usage')
+    ->desc('Get usage queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
        name: 'getQueueUsage',
-        description: '/docs/references/health/get-queue-stats-usage.md',
+        description: '/docs/references/health/get-queue-usage.md',
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -747,7 +715,7 @@ App::get('/v1/health/queue/stats-usage')
    ->action(function (int|string $threshold, Publisher $publisher, Response $response) {
        $threshold = \intval($threshold);

-        $size = $publisher->getQueueSize(new Queue(Event::STATS_USAGE_QUEUE_NAME));
+        $size = $publisher->getQueueSize(new Queue(Event::USAGE_QUEUE_NAME));

        if ($size >= $threshold) {
            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
@@ -756,15 +724,15 @@ App::get('/v1/health/queue/stats-usage')
        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
    });

-App::get('/v1/health/queue/stats-usage-dump')
+App::get('/v1/health/queue/usage-dump')
    ->desc('Get usage dump queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
    ->label('sdk', new Method(
        auth: [AuthType::KEY],
        namespace: 'health',
-        name: 'getQueueStatsUsageDump',
-        description: '/docs/references/health/get-queue-stats-usage-dump.md',
+        name: 'getQueueUsageDump',
+        description: '/docs/references/health/get-queue-usage-dump.md',
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -779,7 +747,7 @@ App::get('/v1/health/queue/stats-usage-dump')
    ->action(function (int|string $threshold, Publisher $publisher, Response $response) {
        $threshold = \intval($threshold);

-        $size = $publisher->getQueueSize(new Queue(Event::STATS_USAGE_DUMP_QUEUE_NAME));
+        $size = $publisher->getQueueSize(new Queue(Event::USAGE_DUMP_QUEUE_NAME));

        if ($size >= $threshold) {
            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
@@ -952,9 +920,8 @@ App::get('/v1/health/queue/failed/:name')
        Event::AUDITS_QUEUE_NAME,
        Event::MAILS_QUEUE_NAME,
        Event::FUNCTIONS_QUEUE_NAME,
-        Event::STATS_RESOURCES_QUEUE_NAME,
-        Event::STATS_USAGE_QUEUE_NAME,
-        Event::STATS_USAGE_DUMP_QUEUE_NAME,
+        Event::USAGE_QUEUE_NAME,
+        Event::USAGE_DUMP_QUEUE_NAME,
        Event::WEBHOOK_QUEUE_NAME,
        Event::CERTIFICATES_QUEUE_NAME,
        Event::BUILDS_QUEUE_NAME,
@@ -118,7 +118,7 @@ App::get('/v1/locale/countries')
    ->inject('response')
    ->inject('locale')
    ->action(function (Response $response, Locale $locale) {
-        $list = array_keys(Config::getParam('locale-countries')); /* @var $list array */
+        $list = Config::getParam('locale-countries'); /* @var $list array */
        $output = [];

        foreach ($list as $value) {
@@ -229,7 +229,7 @@ App::get('/v1/locale/continents')
    ->inject('response')
    ->inject('locale')
    ->action(function (Response $response, Locale $locale) {
-        $list = array_keys(Config::getParam('locale-continents'));
+        $list = Config::getParam('locale-continents');

        foreach ($list as $value) {
            $output[] = new Document([
@@ -25,7 +25,7 @@ use Appwrite\Utopia\Database\Validator\Queries\Topics;
 use Appwrite\Utopia\Response;
 use MaxMind\Db\Reader;
 use Utopia\App;
-use Utopia\Audit\Adapter\Audit;
+use Utopia\Audit\Audit;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
@@ -994,15 +994,13 @@ App::get('/v1/messaging/providers/:providerId/logs')
            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'))),
-        ]);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
+        $offset = $grouped['offset'] ?? 0;

        $audit = new Audit($dbForProject);
        $resource = 'provider/' . $providerId;
-        $logs = $audit->getLogsByResource($resource, $queries);
+        $logs = $audit->getLogsByResource($resource, $limit, $offset);
        $output = [];

        foreach ($logs as $i => &$log) {
@@ -1049,7 +1047,7 @@ App::get('/v1/messaging/providers/:providerId/logs')
        }

        $response->dynamic(new Document([
-            'total' => $audit->countLogsByResource($resource, $queries),
+            'total' => $audit->countLogsByResource($resource),
            'logs' => $output,
        ]), Response::MODEL_LOG_LIST);
    });
@@ -2224,15 +2222,13 @@ App::get('/v1/messaging/topics/:topicId/logs')
            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'))),
-        ]);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
+        $offset = $grouped['offset'] ?? 0;

        $audit = new Audit($dbForProject);
        $resource = 'topic/' . $topicId;
-        $logs = $audit->getLogsByResource($resource, $queries);
+        $logs = $audit->getLogsByResource($resource, $limit, $offset);

        $output = [];

@@ -2280,7 +2276,7 @@ App::get('/v1/messaging/topics/:topicId/logs')
        }

        $response->dynamic(new Document([
-            'total' => $audit->countLogsByResource($resource, $queries),
+            'total' => $audit->countLogsByResource($resource),
            'logs' => $output,
        ]), Response::MODEL_LOG_LIST);
    });
@@ -2636,15 +2632,13 @@ App::get('/v1/messaging/subscribers/:subscriberId/logs')
            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'))),
-        ]);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
+        $offset = $grouped['offset'] ?? 0;

        $audit = new Audit($dbForProject);
        $resource = 'subscriber/' . $subscriberId;
-        $logs = $audit->getLogsByResource($resource, $queries);
+        $logs = $audit->getLogsByResource($resource, $limit, $offset);

        $output = [];

@@ -2692,7 +2686,7 @@ App::get('/v1/messaging/subscribers/:subscriberId/logs')
        }

        $response->dynamic(new Document([
-            'total' => $audit->countLogsByResource($resource, $queries),
+            'total' => $audit->countLogsByResource($resource),
            'logs' => $output,
        ]), Response::MODEL_LOG_LIST);
    });
@@ -2936,7 +2930,7 @@ App::post('/v1/messaging/messages/email')
                break;
            case MessageStatus::SCHEDULED:
                $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                    'region' => $project->getAttribute('region'),
+                    'region' => System::getEnv('_APP_REGION', 'default'),
                    'resourceType' => 'message',
                    'resourceId' => $message->getId(),
                    'resourceInternalId' => $message->getInternalId(),
@@ -3058,7 +3052,7 @@ App::post('/v1/messaging/messages/sms')
                break;
            case MessageStatus::SCHEDULED:
                $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                    'region' => $project->getAttribute('region'),
+                    'region' => System::getEnv('_APP_REGION', 'default'),
                    'resourceType' => 'message',
                    'resourceId' => $message->getId(),
                    'resourceInternalId' => $message->getInternalId(),
@@ -3275,7 +3269,7 @@ App::post('/v1/messaging/messages/push')
                break;
            case MessageStatus::SCHEDULED:
                $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                    'region' => $project->getAttribute('region'),
+                    'region' => System::getEnv('_APP_REGION', 'default'),
                    'resourceType' => 'message',
                    'resourceId' => $message->getId(),
                    'resourceInternalId' => $message->getInternalId(),
@@ -3403,15 +3397,13 @@ App::get('/v1/messaging/messages/:messageId/logs')
            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'))),
-        ]);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
+        $offset = $grouped['offset'] ?? 0;

        $audit = new Audit($dbForProject);
        $resource = 'message/' . $messageId;
-        $logs = $audit->getLogsByResource($resource, $queries);
+        $logs = $audit->getLogsByResource($resource, $limit, $offset);

        $output = [];

@@ -3459,7 +3451,7 @@ App::get('/v1/messaging/messages/:messageId/logs')
        }

        $response->dynamic(new Document([
-            'total' => $audit->countLogsByResource($resource, $queries),
+            'total' => $audit->countLogsByResource($resource),
            'logs' => $output,
        ]), Response::MODEL_LOG_LIST);
    });
@@ -3661,7 +3653,7 @@ App::patch('/v1/messaging/messages/email/:messageId')

        if (\is_null($currentScheduledAt) && !\is_null($scheduledAt)) {
            $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                'region' => $project->getAttribute('region'),
+                'region' => System::getEnv('_APP_REGION', 'default'),
                'resourceType' => 'message',
                'resourceId' => $message->getId(),
                'resourceInternalId' => $message->getInternalId(),
@@ -3862,7 +3854,7 @@ App::patch('/v1/messaging/messages/sms/:messageId')

        if (\is_null($currentScheduledAt) && !\is_null($scheduledAt)) {
            $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                'region' => $project->getAttribute('region'),
+                'region' => System::getEnv('_APP_REGION', 'default'),
                'resourceType' => 'message',
                'resourceId' => $message->getId(),
                'resourceInternalId' => $message->getInternalId(),
@@ -4035,7 +4027,7 @@ App::patch('/v1/messaging/messages/push/:messageId')

        if (\is_null($currentScheduledAt) && !\is_null($scheduledAt)) {
            $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                'region' => $project->getAttribute('region'),
+                'region' => System::getEnv('_APP_REGION', 'default'),
                'resourceType' => 'message',
                'resourceId' => $message->getId(),
                'resourceInternalId' => $message->getInternalId(),
@@ -48,9 +48,9 @@ App::post('/v1/migrations/appwrite')
        ]
    ))
    ->param('resources', [], new ArrayList(new WhiteList(Appwrite::getSupportedResources())), 'List of resources to migrate')
-    ->param('endpoint', '', new URL(), 'Source Appwrite endpoint')
-    ->param('projectId', '', new UID(), 'Source Project ID')
-    ->param('apiKey', '', new Text(512), 'Source API Key')
+    ->param('endpoint', '', new URL(), "Source's Appwrite Endpoint")
+    ->param('projectId', '', new UID(), "Source's Project ID")
+    ->param('apiKey', '', new Text(512), "Source's API Key")
    ->inject('response')
    ->inject('dbForProject')
    ->inject('project')
@@ -17,6 +17,7 @@ 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;

@@ -40,18 +41,14 @@ 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, Document $project, Database $dbForProject, callable $getLogsDB, array $smsRates) {
+    ->action(function (string $startDate, string $endDate, string $period, Response $response, Database $dbForProject, 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,
@@ -67,7 +64,6 @@ App::get('/v1/project/usage')
                METRIC_BUILDS_STORAGE,
                METRIC_DATABASES_OPERATIONS_READS,
                METRIC_DATABASES_OPERATIONS_WRITES,
-                METRIC_FILES_IMAGES_TRANSFORMED,
            ],
            'period' => [
                METRIC_NETWORK_REQUESTS,
@@ -80,7 +76,6 @@ App::get('/v1/project/usage')
                METRIC_BUILDS_MB_SECONDS,
                METRIC_DATABASES_OPERATIONS_READS,
                METRIC_DATABASES_OPERATIONS_WRITES,
-                METRIC_FILES_IMAGES_TRANSFORMED,
            ]
        ];

@@ -99,11 +94,9 @@ App::get('/v1/project/usage')
            '1d' => 'Y-m-d\T00:00:00.000P',
        };

-        Authorization::skip(function () use ($dbForProject, $dbForLogs, $firstDay, $lastDay, $period, $metrics, $limit, &$total, &$stats) {
+        Authorization::skip(function () use ($dbForProject, $firstDay, $lastDay, $period, $metrics, $limit, &$total, &$stats) {
            foreach ($metrics['total'] as $metric) {
-                $db = ($metric === METRIC_FILES_IMAGES_TRANSFORMED) ? $dbForLogs : $dbForProject;
-
-                $result = $db->findOne('stats', [
+                $result = $dbForProject->findOne('stats', [
                    Query::equal('metric', [$metric]),
                    Query::equal('period', ['inf'])
                ]);
@@ -111,9 +104,7 @@ App::get('/v1/project/usage')
            }

            foreach ($metrics['period'] as $metric) {
-                $db = ($metric === METRIC_FILES_IMAGES_TRANSFORMED) ? $dbForLogs : $dbForProject;
-
-                $results = $db->find('stats', [
+                $results = $dbForProject->find('stats', [
                    Query::equal('metric', [$metric]),
                    Query::equal('period', [$period]),
                    Query::greaterThanEqual('time', $firstDay),
@@ -373,8 +364,6 @@ 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);
    });

@@ -399,11 +388,12 @@ 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, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
+    ->action(function (string $key, string $value, bool $secret, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
        $variableId = ID::unique();

        $variable = new Document([
@@ -418,6 +408,7 @@ App::post('/v1/project/variables')
            'resourceType' => 'project',
            'key' => $key,
            'value' => $value,
+            'secret' => $secret,
            'search' => implode(' ', [$variableId, $key, 'project']),
        ]);

@@ -518,19 +509,25 @@ 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, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
+    ->action(function (string $variableId, string $key, ?string $value, ?bool $secret, 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 {
@@ -21,7 +21,7 @@ use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use PHPMailer\PHPMailer\PHPMailer;
 use Utopia\App;
-use Utopia\Audit\Adapter\Audit;
+use Utopia\Audit\Audit;
 use Utopia\Cache\Cache;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
@@ -46,7 +46,7 @@ App::post('/v1/proxy/rules')
        ]
    ))
    ->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('resourceType', null, new WhiteList(['api', 'function', 'site']), 'Action definition for the rule. Possible values are "api", "function" and "site"')
    ->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')
@@ -60,9 +60,15 @@ App::post('/v1/proxy/rules')
            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'You cannot assign your main domain to specific resource. Please use subdomain or a different domain.');
        }

+        $sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
        $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 (
+            ($functionsDomain !== '' && str_ends_with($domain, $functionsDomain)) ||
+            ($sitesDomain !== '' && str_ends_with($domain, $sitesDomain))
+        ) {
+            // TODO: Refactor later
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'You cannot assign your functions or sites domain or their subdomains to a specific resource. Please use a different domain.');
        }

        if ($domain === 'localhost' || $domain === APP_HOSTNAME_INTERNAL) {
@@ -98,18 +104,33 @@ App::post('/v1/proxy/rules')

        $resourceInternalId = '';

-        if ($resourceType == 'function') {
-            if (empty($resourceId)) {
-                throw new Exception(Exception::FUNCTION_NOT_FOUND);
-            }
+        switch ($resourceType) {
+            case 'function':
+                if (empty($resourceId)) {
+                    throw new Exception(Exception::FUNCTION_NOT_FOUND);
+                }

-            $function = $dbForProject->getDocument('functions', $resourceId);
+                $function = $dbForProject->getDocument('functions', $resourceId);

-            if ($function->isEmpty()) {
-                throw new Exception(Exception::RULE_RESOURCE_NOT_FOUND);
-            }
+                if ($function->isEmpty()) {
+                    throw new Exception(Exception::RULE_RESOURCE_NOT_FOUND);
+                }

-            $resourceInternalId = $function->getInternalId();
+                $resourceInternalId = $function->getInternalId();
+                break;
+            case 'site':
+                if (empty($resourceId)) {
+                    throw new Exception(Exception::SITE_NOT_FOUND);
+                }
+
+                $site = $dbForProject->getDocument('sites', $resourceId);
+
+                if ($site->isEmpty()) {
+                    throw new Exception(Exception::RULE_RESOURCE_NOT_FOUND);
+                }
+
+                $resourceInternalId = $site->getInternalId();
+                break;
        }

        try {
@@ -130,13 +151,11 @@ App::post('/v1/proxy/rules')
            'resourceId' => $resourceId,
            'resourceInternalId' => $resourceInternalId,
            'certificateId' => '',
-            'owner' => '',
-            'region' => $project->getAttribute('region')
        ]);

        $status = 'created';
-        $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS');
-        if (!empty($functionsDomain) && \str_ends_with($domain->get(), $functionsDomain)) {
+
+        if (\str_ends_with($domain->get(), $functionsDomain) || \str_ends_with($domain->get(), $sitesDomain)) {
            $status = 'verified';
        }

@@ -392,3 +411,34 @@ App::patch('/v1/proxy/rules/:ruleId/verification')

        $response->dynamic($rule, Response::MODEL_PROXY_RULE);
    });
+
+App::get('/v1/proxy/subdomains')
+    ->desc('Check if subdomain is available')
+    ->groups(['api', 'proxy'])
+    ->label('scope', 'rules.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'proxy')
+    ->label('sdk.method', 'checkSubdomain')
+    ->label('sdk.description', '/docs/references/proxy/check-subdomain.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_NONE)
+    ->param('resourceType', null, new WhiteList(['function', 'site']), 'Action definition for the rule. Possible values are "function" and "site"')
+    ->param('subdomain', '', new Text(256), 'Subdomain name.')
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $resourceType, string $subdomain, Response $response, Database $dbForPlatform) {
+        //TODO: Add tests for this endpoint
+        $resourceDomain = $resourceType === 'site' ? System::getEnv('_APP_DOMAIN_SITES', '') : System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
+        $domain = $subdomain . '.' . $resourceDomain;
+
+        $document = $dbForPlatform->findOne('rules', [
+            Query::equal('domain', [$domain]),
+        ]);
+
+        if ($document && !$document->isEmpty()) {
+            throw new Exception(Exception::RULE_ALREADY_EXISTS, 'Subdomain already assigned to different project.');
+        }
+
+        $response->noContent();
+    });
@@ -6,6 +6,7 @@ use Appwrite\Auth\Auth;
 use Appwrite\ClamAV\Network;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
+use Appwrite\Event\Usage;
 use Appwrite\Extend\Exception;
 use Appwrite\OpenSSL\OpenSSL;
 use Appwrite\SDK\AuthType;
@@ -934,11 +935,15 @@ 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')
-    ->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) {
+    ->inject('queueForUsage')
+    ->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, Usage $queueForUsage) {

        if (!\extension_loaded('imagick')) {
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Imagick extension is missing');
@@ -1066,19 +1071,22 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')

        $contentType = (\array_key_exists($output, $outputs)) ? $outputs[$output] : $outputs['jpg'];

-        //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));
-            }
+        $queueForUsage
+            ->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));
        }

        $response
            ->addHeader('Cache-Control', 'private, max-age=2592000') // 30 days
            ->setContentType($contentType)
-            ->file($data);
+            ->file($data)
+        ;

        unset($image);
    });
@@ -1871,12 +1879,9 @@ 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')
-    ->inject('getLogsDB')
-    ->action(function (string $bucketId, string $range, Response $response, Document $project, Database $dbForProject, callable $getLogsDB) {
+    ->action(function (string $bucketId, string $range, Response $response, Database $dbForProject) {

-        $dbForLogs = call_user_func($getLogsDB, $project);
        $bucket = $dbForProject->getDocument('buckets', $bucketId);

        if ($bucket->isEmpty()) {
@@ -1889,16 +1894,12 @@ 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, $dbForLogs, $bucket, $days, $metrics, &$stats) {
-            foreach ($metrics as $metric) {
-                $db = ($metric === str_replace('{bucketInternalId}', $bucket->getInternalId(), METRIC_BUCKET_ID_FILES_IMAGES_TRANSFORMED))
-                    ? $dbForLogs
-                    : $dbForProject;

-                $result =  $db->findOne('stats', [
+        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats, &$total) {
+            foreach ($metrics as $metric) {
+                $result =  $dbForProject->findOne('stats', [
                    Query::equal('metric', [$metric]),
                    Query::equal('period', ['inf'])
                ]);
@@ -1906,7 +1907,7 @@ App::get('/v1/storage/:bucketId/usage')
                $stats[$metric]['total'] = $result['value'] ?? 0;
                $limit = $days['limit'];
                $period = $days['period'];
-                $results = $db->find('stats', [
+                $results = $dbForProject->find('stats', [
                    Query::equal('metric', [$metric]),
                    Query::equal('period', [$period]),
                    Query::limit($limit),
@@ -1947,7 +1948,5 @@ 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);
    });
@@ -8,7 +8,7 @@ use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Mail;
 use Appwrite\Event\Messaging;
-use Appwrite\Event\StatsUsage;
+use Appwrite\Event\Usage;
 use Appwrite\Extend\Exception;
 use Appwrite\Network\Validator\Email;
 use Appwrite\Platform\Workers\Deletes;
@@ -26,7 +26,7 @@ use libphonenumber\PhoneNumberUtil;
 use MaxMind\Db\Reader;
 use Utopia\Abuse\Abuse;
 use Utopia\App;
-use Utopia\Audit\Adapter\Audit;
+use Utopia\Audit\Audit;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
@@ -466,9 +466,9 @@ App::post('/v1/teams/:teamId/memberships')
    ->inject('queueForMessaging')
    ->inject('queueForEvents')
    ->inject('timelimit')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('plan')
-    ->action(function (string $teamId, string $email, string $userId, string $phone, array $roles, string $url, string $name, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Mail $queueForMails, Messaging $queueForMessaging, Event $queueForEvents, callable $timelimit, StatsUsage $queueForStatsUsage, array $plan) {
+    ->action(function (string $teamId, string $email, string $userId, string $phone, array $roles, string $url, string $name, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Mail $queueForMails, Messaging $queueForMessaging, Event $queueForEvents, callable $timelimit, Usage $queueForUsage, array $plan) {
        $isAppUser = Auth::isAppUser(Authorization::getRoles());
        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());

@@ -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 = $invitee->getAttribute('name', '') ?: $name;
+            $name = empty($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) {
@@ -588,8 +588,9 @@ App::post('/v1/teams/:teamId/memberships')
            Query::equal('teamInternalId', [$team->getInternalId()]),
        ]);

-        $secret = Auth::tokenGenerator();
        if ($membership->isEmpty()) {
+            $secret = Auth::tokenGenerator();
+
            $membershipId = ID::unique();
            $membership = new Document([
                '$id' => $membershipId,
@@ -615,13 +616,9 @@ App::post('/v1/teams/:teamId/memberships')
            $membership = ($isPrivilegedUser || $isAppUser) ?
                Authorization::skip(fn () => $dbForProject->createDocument('memberships', $membership)) :
                $dbForProject->createDocument('memberships', $membership);
+            Authorization::skip(fn () => $dbForProject->increaseDocumentAttribute('teams', $team->getId(), 'total', 1));

-            if ($isPrivilegedUser || $isAppUser) {
-                Authorization::skip(fn () => $dbForProject->increaseDocumentAttribute('teams', $team->getId(), 'total', 1));
-            }
-
-        } elseif ($membership->getAttribute('confirm') === false) {
-            $membership->setAttribute('secret', Auth::hash($secret));
+        } else {
            $membership->setAttribute('invited', DateTime::now());

            if ($isPrivilegedUser || $isAppUser) {
@@ -632,10 +629,9 @@ App::post('/v1/teams/:teamId/memberships')
            $membership = ($isPrivilegedUser || $isAppUser) ?
                Authorization::skip(fn () => $dbForProject->updateDocument('memberships', $membership->getId(), $membership)) :
                $dbForProject->updateDocument('memberships', $membership->getId(), $membership);
-        } else {
-            throw new Exception(Exception::MEMBERSHIP_ALREADY_CONFIRMED);
        }

+
        if ($isPrivilegedUser || $isAppUser) {
            $dbForProject->purgeCachedDocument('users', $invitee->getId());
        } else {
@@ -718,7 +714,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();

@@ -761,11 +757,11 @@ App::post('/v1/teams/:teamId/memberships')
                        $countryCode = $helper->parse($phone)->getCountryCode();

                        if (!empty($countryCode)) {
-                            $queueForStatsUsage
+                            $queueForUsage
                                ->addMetric(str_replace('{countryCode}', $countryCode, METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE), 1);
                        }
                    }
-                    $queueForStatsUsage
+                    $queueForUsage
                        ->addMetric(METRIC_AUTH_METHOD_PHONE, 1)
                        ->setProject($project)
                        ->trigger();
@@ -1365,15 +1361,13 @@ App::get('/v1/teams/:teamId/logs')
            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'))),
-        ]);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
+        $offset = $grouped['offset'] ?? 0;

        $audit = new Audit($dbForProject);
        $resource = 'team/' . $team->getId();
-        $logs = $audit->getLogsByResource($resource, $queries);
+        $logs = $audit->getLogsByResource($resource, $limit, $offset);

        $output = [];

@@ -1420,7 +1414,7 @@ App::get('/v1/teams/:teamId/logs')
            }
        }
        $response->dynamic(new Document([
-            'total' => $audit->countLogsByResource($resource, $queries),
+            'total' => $audit->countLogsByResource($resource),
            'logs' => $output,
        ]), Response::MODEL_LOG_LIST);
    });
@@ -27,7 +27,7 @@ use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use MaxMind\Db\Reader;
 use Utopia\App;
-use Utopia\Audit\Adapter\Audit;
+use Utopia\Audit\Audit;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
@@ -862,15 +862,13 @@ App::get('/v1/users/:userId/logs')
            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'))),
-        ]);
+        $grouped = Query::groupByType($queries);
+        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
+        $offset = $grouped['offset'] ?? 0;

        $audit = new Audit($dbForProject);

-        $logs = $audit->getLogsByUser($user->getInternalId(), $queries);
+        $logs = $audit->getLogsByUser($user->getInternalId(), $limit, $offset);

        $output = [];

@@ -917,7 +915,7 @@ App::get('/v1/users/:userId/logs')
        }

        $response->dynamic(new Document([
-            'total' => $audit->countLogsByUser($user->getInternalId(), $queries),
+            'total' => $audit->countLogsByUser($user->getInternalId()),
            'logs' => $output,
        ]), Response::MODEL_LOG_LIST);
    });
@@ -19,6 +19,7 @@ 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;
@@ -49,29 +50,30 @@ 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 $resource) {
+    foreach ($repositories as $repository) {
        try {
-            $resourceType = $resource->getAttribute('resourceType');
+            $resourceType = $repository->getAttribute('resourceType');

-            if ($resourceType !== "function") {
+            if ($resourceType !== "function" && $resourceType !== "site") {
                continue;
            }

-            $projectId = $resource->getAttribute('projectId');
+            $projectId = $repository->getAttribute('projectId');
            $project = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
            $dbForProject = $getProjectDB($project);

-            $functionId = $resource->getAttribute('resourceId');
-            $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));
-            $functionInternalId = $function->getInternalId();
+            $resourceCollection = $resourceType === "function" ? 'functions' : 'sites';
+            $resourceId = $repository->getAttribute('resourceId');
+            $resource = Authorization::skip(fn () => $dbForProject->getDocument($resourceCollection, $resourceId));
+            $resourceInternalId = $resource->getInternalId();

            $deploymentId = ID::unique();
-            $repositoryId = $resource->getId();
-            $repositoryInternalId = $resource->getInternalId();
-            $providerRepositoryId = $resource->getAttribute('providerRepositoryId');
-            $installationId = $resource->getAttribute('installationId');
-            $installationInternalId = $resource->getAttribute('installationInternalId');
-            $productionBranch = $function->getAttribute('providerBranch');
+            $repositoryId = $repository->getId();
+            $repositoryInternalId = $repository->getInternalId();
+            $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
+            $installationId = $repository->getAttribute('installationId');
+            $installationInternalId = $repository->getAttribute('installationInternalId');
+            $productionBranch = $resource->getAttribute('providerBranch');
            $activate = false;

            if ($providerBranch == $productionBranch && $external === false) {
@@ -95,7 +97,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
            $isAuthorized = !$external;

            if (!$isAuthorized && !empty($providerPullRequestId)) {
-                if (\in_array($providerPullRequestId, $resource->getAttribute('providerPullRequestIds', []))) {
+                if (\in_array($providerPullRequestId, $repository->getAttribute('providerPullRequestIds', []))) {
                    $isAuthorized = true;
                }
            }
@@ -108,7 +110,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId

            $latestCommentId = '';

-            if (!empty($providerPullRequestId) && $function->getAttribute('providerSilentMode', false) === false) {
+            if (!empty($providerPullRequestId) && $resource->getAttribute('providerSilentMode', false) === false) {
                $latestComment = Authorization::skip(fn () => $dbForPlatform->findOne('vcsComments', [
                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
                    Query::equal('providerPullRequestId', [$providerPullRequestId]),
@@ -117,14 +119,15 @@ $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, $function, $commentStatus, $deploymentId, $action);
+                    $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '', '');

                    $latestCommentId = \strval($github->updateComment($owner, $repositoryName, $latestCommentId, $comment->generateComment()));
                } else {
                    $comment = new Comment();
-                    $comment->addBuild($project, $function, $commentStatus, $deploymentId, $action);
+                    $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '', '');
                    $latestCommentId = \strval($github->createComment($owner, $repositoryName, $providerPullRequestId, $comment->generateComment()));

                    if (!empty($latestCommentId)) {
@@ -161,19 +164,19 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                    $latestCommentId = $comment->getAttribute('providerCommentId', '');
                    $comment = new Comment();
                    $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
-                    $comment->addBuild($project, $function, $commentStatus, $deploymentId, $action);
+                    $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '', '');

                    $latestCommentId = \strval($github->updateComment($owner, $repositoryName, $latestCommentId, $comment->generateComment()));
                }
            }

            if (!$isAuthorized) {
-                $functionName = $function->getAttribute('name');
+                $resourceName = $resource->getAttribute('name');
                $projectName = $project->getAttribute('name');
-                $name = "{$functionName} ({$projectName})";
+                $name = "{$resourceName} ({$projectName})";
                $message = 'Authorization required for external contributor.';

-                $providerRepositoryId = $resource->getAttribute('providerRepositoryId');
+                $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
                try {
                    $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
                    if (empty($repositoryName)) {
@@ -200,11 +203,14 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                    Permission::update(Role::any()),
                    Permission::delete(Role::any()),
                ],
-                'resourceId' => $functionId,
-                'resourceInternalId' => $functionInternalId,
-                'resourceType' => 'functions',
-                'entrypoint' => $function->getAttribute('entrypoint'),
-                'commands' => $function->getAttribute('commands'),
+                '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', ''),
                'type' => 'vcs',
                'installationId' => $installationId,
                'installationInternalId' => $installationInternalId,
@@ -222,17 +228,61 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                'providerCommitUrl' => $providerCommitUrl,
                'providerCommentId' => \strval($latestCommentId),
                'providerBranch' => $providerBranch,
-                'search' => implode(' ', [$deploymentId, $function->getAttribute('entrypoint')]),
+                'search' => implode(' ', [$deploymentId, $resource->getAttribute('entrypoint', '')]),
                'activate' => $activate,
            ]));

-            if (!empty($providerCommitHash) && $function->getAttribute('providerSilentMode', false) === false) {
-                $functionName = $function->getAttribute('name');
+            // Preview deployments for sites
+            if ($resource->getCollection() === 'sites') {
+                $sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
+                $domain = "{$deploymentId}-{$resourceId}.{$sitesDomain}";
+                $ruleId = md5($domain);
+
+                $rule = Authorization::skip(
+                    fn () => $dbForPlatform->createDocument('rules', new Document([
+                        '$id' => $ruleId,
+                        'projectId' => $project->getId(),
+                        'projectInternalId' => $project->getInternalId(),
+                        'domain' => $domain,
+                        'resourceType' => 'deployment',
+                        'resourceId' => $deploymentId,
+                        'resourceInternalId' => $deployment->getInternalId(),
+                        'status' => 'verified',
+                        'certificateId' => '',
+                    ]))
+                );
+
+                // Branch preview
+                if (!empty($providerBranch)) {
+                    $domain = "git-{$providerBranch}-{$resource->getId()}.{$sitesDomain}";
+                    $ruleId = md5($domain);
+                    try {
+                        Authorization::skip(
+                            fn () => $dbForPlatform->createDocument('rules', new Document([
+                                '$id' => $ruleId,
+                                'projectId' => $project->getId(),
+                                'projectInternalId' => $project->getInternalId(),
+                                'domain' => $domain,
+                                'resourceType' => 'deployment',
+                                'resourceId' => $deployment->getId(),
+                                'resourceInternalId' => $deployment->getInternalId(),
+                                'status' => 'verified',
+                                'certificateId' => '',
+                            ]))
+                        );
+                    } 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');
                $projectName = $project->getAttribute('name');
-                $name = "{$functionName} ({$projectName})";
+                $name = "{$resourceName} ({$projectName})";
                $message = 'Starting...';

-                $providerRepositoryId = $resource->getAttribute('providerRepositoryId');
+                $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
                try {
                    $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
                    if (empty($repositoryName)) {
@@ -243,17 +293,17 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                }
                $owner = $github->getOwnerName($providerInstallationId);

-                $providerTargetUrl = $request->getProtocol() . '://' . $request->getHostname() . "/console/project-$projectId/functions/function-$functionId";
+                $providerTargetUrl = $request->getProtocol() . '://' . $request->getHostname() . "/console/project-$projectId/$resourceCollection/$resourceType-$resourceId";
                $github->updateCommitStatus($repositoryName, $providerCommitHash, $owner, 'pending', $message, $providerTargetUrl, $name);
            }

            $queueForBuilds
                ->setType(BUILD_TYPE_DEPLOYMENT)
-                ->setResource($function)
+                ->setResource($resource)
                ->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
+            $queueForBuilds->trigger(); // must trigger here so that we create a build for each function/site

            //TODO: Add event?
        } catch (Throwable $e) {
@@ -957,7 +1007,7 @@ App::post('/v1/vcs/github/events')

                $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);

-                //find functionId from functions table
+                //find resourceId from relevant resources table
                $repositories = Authorization::skip(fn () => $dbForPlatform->find('repositories', [
                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
                    Query::limit(100),
@@ -969,7 +1019,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 as well)
+                    // TODO: Use worker for this job instead (update function/site as well)
                    $providerInstallationId = $parsedPayload["installationId"];

                    $installations = $dbForPlatform->find('installations', [
@@ -7,13 +7,16 @@ use Appwrite\Auth\Auth;
 use Appwrite\Event\Certificate;
 use Appwrite\Event\Event;
 use Appwrite\Event\Func;
-use Appwrite\Event\StatsUsage;
+use Appwrite\Event\Usage;
 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\SDK\Response as SDKResponse;
+use Appwrite\Transformation\Adapter\Preview;
+use Appwrite\Transformation\Transformation;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Request\Filters\V16 as RequestV16;
 use Appwrite\Utopia\Request\Filters\V17 as RequestV17;
@@ -42,6 +45,7 @@ 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;
@@ -50,7 +54,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)
+function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname)
 {
    $utopia->getRoute()?->label('error', __DIR__ . '/../views/general/error.phtml');

@@ -61,9 +65,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') {
-        $route = Authorization::skip(fn () => $dbForPlatform->getDocument('rules', md5($host)));
+        $rule = Authorization::skip(fn () => $dbForPlatform->getDocument('rules', md5($host)));
    } else {
-        $route = Authorization::skip(
+        $rule = Authorization::skip(
            fn () => $dbForPlatform->find('rules', [
                Query::equal('domain', [$host]),
                Query::limit(1)
@@ -71,12 +75,12 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        )[0] ?? new Document();
    }

-    if ($route->isEmpty()) {
-        if ($host === System::getEnv('_APP_DOMAIN_FUNCTIONS', '')) {
+    if ($rule->isEmpty()) {
+        if ($host === System::getEnv('_APP_DOMAIN_FUNCTIONS', '') || $host === System::getEnv('_APP_DOMAIN_SITES', '')) {
            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', ''))) {
+        if (\str_ends_with($host, System::getEnv('_APP_DOMAIN_FUNCTIONS', '')) || \str_ends_with($host, System::getEnv('_APP_DOMAIN_SITES', ''))) {
            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.');
        }

@@ -88,10 +92,11 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw

        // Act as API - no Proxy logic
        $utopia->getRoute()?->label('error', '');
+
        return false;
    }

-    $projectId = $route->getAttribute('projectId');
+    $projectId = $rule->getAttribute('projectId');
    $project = Authorization::skip(
        fn () => $dbForPlatform->getDocument('projects', $projectId)
    );
@@ -117,9 +122,17 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        return false;
    }

-    $type = $route->getAttribute('resourceType');
+    $type = $rule->getAttribute('resourceType');

-    if ($type === 'function') {
+    if ($type === 'function' || $type === 'site' || $type === 'deployment') {
+        $resourceCollection = match ($type) {
+            'function' => 'functions',
+            'site' => 'sites',
+            'deployment' => 'deployments',
+        };
+    }
+
+    if ($type === 'function' || $type === 'site' || $type === 'deployment') {
        $method = $utopia->getRoute()?->getLabel('sdk', null);

        if (empty($method)) {
@@ -144,18 +157,17 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            $utopia->getRoute()?->label('sdk', $method);
        }

-        if (System::getEnv('_APP_OPTIONS_FUNCTIONS_FORCE_HTTPS', 'disabled') === 'enabled') { // Force HTTPS
+        if (System::getEnv('_APP_OPTIONS_COMPUTE_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());
            }
        }

-        $functionId = $route->getAttribute('resourceId');
-        $projectId = $route->getAttribute('projectId');
+        $resourceId = $rule->getAttribute('resourceId');
+        $projectId = $rule->getAttribute('projectId');

        $path = ($swooleRequest->server['request_uri'] ?? '/');
        $query = ($swooleRequest->server['query_string'] ?? '');
@@ -163,7 +175,6 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            $path .= '?' . $query;
        }

-
        $body = $swooleRequest->getContent() ?? '';
        $method = $swooleRequest->server['request_method'];

@@ -171,31 +182,57 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw

        $project = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $projectId));

+        /** @var Database $dbForProject */
        $dbForProject = $getProjectDB($project);

-        $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));
+        if ($resourceCollection === 'deployments') {
+            $subResource = Authorization::skip(fn () => $dbForProject->getDocument($resourceCollection, $resourceId));
+            $resource = Authorization::skip(fn () => $dbForProject->getDocument($subResource->getAttribute('resourceType'), $subResource->getAttribute('resourceId')));
+        } else {
+            $resource = Authorization::skip(fn () => $dbForProject->getDocument($resourceCollection, $resourceId));
+        }

-        if ($function->isEmpty() || !$function->getAttribute('enabled')) {
+        if ($resource->isEmpty() || !$resource->getAttribute('enabled')) {
            throw new AppwriteException(AppwriteException::FUNCTION_NOT_FOUND);
        }

-        if ($isResourceBlocked($project, RESOURCE_TYPE_FUNCTIONS, $functionId)) {
+        if ($isResourceBlocked($project, RESOURCE_TYPE_FUNCTIONS, $resourceId)) {
            throw new AppwriteException(AppwriteException::GENERAL_RESOURCE_BLOCKED);
        }

-        $version = $function->getAttribute('version', 'v2');
+        $version = match ($type) {
+            'function' => $resource->getAttribute('version', 'v2'),
+            'site' => 'v4',
+            'deployment' => 'v4'
+        };
+
        $runtimes = Config::getParam($version === 'v2' ? 'runtimes-v2' : 'runtimes', []);
-        $spec = Config::getParam('runtime-specifications')[$function->getAttribute('specification', APP_FUNCTION_SPECIFICATION_DEFAULT)];
+        $spec = Config::getParam('runtime-specifications')[$resource->getAttribute('specification', APP_COMPUTE_SPECIFICATION_DEFAULT)];

-        $runtime = (isset($runtimes[$function->getAttribute('runtime', '')])) ? $runtimes[$function->getAttribute('runtime', '')] : null;
+        $runtime = match ($type) {
+            'function' => $runtimes[$resource->getAttribute('runtime')] ?? null,
+            'site' => $runtimes[$resource->getAttribute('buildRuntime')] ?? null,
+            'deployment' => $runtimes[$resource->getAttribute('buildRuntime')] ?? null,
+            default => null
+        };

-        if (\is_null($runtime)) {
-            throw new AppwriteException(AppwriteException::FUNCTION_RUNTIME_UNSUPPORTED, 'Runtime "' . $function->getAttribute('runtime', '') . '" is not supported');
+        if ($resource->getAttribute('adapter', '') === 'static') {
+            $runtime = $runtimes['static-1'] ?? null;
        }

-        $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $function->getAttribute('deployment', '')));
+        if (\is_null($runtime)) {
+            throw new AppwriteException(AppwriteException::FUNCTION_RUNTIME_UNSUPPORTED, 'Runtime "' . $resource->getAttribute('runtime', '') . '" is not supported');
+        }

-        if ($deployment->getAttribute('resourceId') !== $function->getId()) {
+        $deploymentId = match ($type) {
+            'function' => $resource->getAttribute('deployment', ''),
+            'site' => $resource->getAttribute('deploymentId', ''),
+            'deployment' => $subResource->getId()
+        };
+
+        $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $deploymentId));
+
+        if ($deployment->getAttribute('resourceId') !== $resource->getId()) {
            throw new AppwriteException(AppwriteException::DEPLOYMENT_NOT_FOUND, 'Deployment not found. Create a deployment before trying to execute a function');
        }

@@ -213,28 +250,34 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            throw new AppwriteException(AppwriteException::BUILD_NOT_READY);
        }

-        $permissions = $function->getAttribute('execute');
+        //todo: figure out for sites/functions
+        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"');
+            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';

+        //todo: check if this would work for sites
+        if ($type === 'function') {
+            $jwtExpiry = $resource->getAttribute('timeout', 900);
+            $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', $jwtExpiry, 0);
+            $apiKey = $jwtObj->encode([
+                'projectId' => $project->getId(),
+                'scopes' => $resource->getAttribute('scopes', [])
+            ]);
+            $headers['x-appwrite-key'] = API_KEY_DYNAMIC . '_' . $apiKey;
+            $headers['x-appwrite-trigger'] = 'http';
+            $headers['x-appwrite-user-jwt'] = '';
+        }
+
        $ip = $headers['x-real-ip'] ?? '';
        if (!empty($ip)) {
            $record = $geodb->get($ip);
@@ -260,12 +303,10 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        $execution = new Document([
            '$id' => $executionId,
            '$permissions' => [],
-            'functionInternalId' => $function->getInternalId(),
-            'functionId' => $function->getId(),
+            'resourceInternalId' => $resource->getInternalId(),
+            'resourceId' => $resource->getId(),
            'deploymentInternalId' => $deployment->getInternalId(),
            'deploymentId' => $deployment->getId(),
-            'trigger' => 'http', // http / schedule / event
-            'status' =>  'processing', // waiting / processing / completed / failed
            'responseStatusCode' => 0,
            'responseHeaders' => [],
            'requestPath' => $path,
@@ -274,13 +315,21 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            'errors' => '',
            'logs' => '',
            'duration' => 0.0,
-            'search' => implode(' ', [$functionId, $executionId]),
+            'search' => implode(' ', [$resourceId, $executionId]),
        ]);

+        if ($type === 'function') {
+            $execution->setAttribute('resourceType', 'functions');
+            $execution->setAttribute('trigger', 'http'); // http / schedule / event
+            $execution->setAttribute('status', 'processing'); // waiting / processing / completed / failed
+        } elseif ($type === 'site') {
+            $execution->setAttribute('resourceType', 'sites');
+        }
+
        $queueForEvents
-            ->setParam('functionId', $function->getId())
+            ->setParam('functionId', $resource->getId())
            ->setParam('executionId', $execution->getId())
-            ->setContext('function', $function);
+            ->setContext('function', $resource);

        $durationStart = \microtime(true);

@@ -297,12 +346,12 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        }

        // Shared vars
-        foreach ($function->getAttribute('varsProject', []) as $var) {
+        foreach ($resource->getAttribute('varsProject', []) as $var) {
            $vars[$var->getAttribute('key')] = $var->getAttribute('value', '');
        }

        // Function vars
-        foreach ($function->getAttribute('vars', []) as $var) {
+        foreach ($resource->getAttribute('vars', []) as $var) {
            $vars[$var->getAttribute('key')] = $var->getAttribute('value', '');
        }

@@ -313,14 +362,14 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        // Appwrite vars
        $vars = \array_merge($vars, [
            'APPWRITE_FUNCTION_API_ENDPOINT' => $endpoint,
-            'APPWRITE_FUNCTION_ID' => $functionId,
-            'APPWRITE_FUNCTION_NAME' => $function->getAttribute('name'),
+            'APPWRITE_FUNCTION_ID' => $resourceId,
+            'APPWRITE_FUNCTION_NAME' => $resource->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_FUNCTION_CPUS_DEFAULT,
-            'APPWRITE_FUNCTION_MEMORY' => $spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT,
+            'APPWRITE_COMPUTE_CPUS' => $spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT,
+            'APPWRITE_COMPUTE_MEMORY' => $spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT,
            'APPWRITE_VERSION' => APP_VERSION_STABLE,
            'APPWRITE_REGION' => $project->getAttribute('region'),
            'APPWRITE_DEPLOYMENT_TYPE' => $deployment->getAttribute('type', ''),
@@ -341,29 +390,80 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        /** 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 . '"';
+            $version = match ($type) {
+                'function' => $resource->getAttribute('version', 'v2'),
+                'site' => 'v4',
+                'deployment' => 'v4'
+            };
+            $entrypoint = match ($type) {
+                'function' => $deployment->getAttribute('entrypoint', ''),
+                'site' => '',
+                'deployment' => ''
+            };
+
+            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' || $type === 'deployment') {
+                $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' => '',
+                'deployment' => ''
+            };
+
            $executionResponse = $executor->createExecution(
                projectId: $project->getId(),
                deploymentId: $deployment->getId(),
                body: \strlen($body) > 0 ? $body : null,
                variables: $vars,
-                timeout: $function->getAttribute('timeout', 0),
+                timeout: $resource->getAttribute('timeout', 30),
                image: $runtime['image'],
                source: $build->getAttribute('path', ''),
-                entrypoint: $deployment->getAttribute('entrypoint', ''),
+                entrypoint: $entrypoint,
                version: $version,
                path: $path,
                method: $method,
                headers: $headers,
-                runtimeEntrypoint: $command,
-                cpus: $spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT,
-                memory: $spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT,
-                logging: $function->getAttribute('logging', true),
+                runtimeEntrypoint: $runtimeEntrypoint,
+                cpus: $spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT,
+                memory: $spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT,
+                logging: $resource->getAttribute('logging', true),
                requestTimeout: 30
            );

+
+            // Branded banner for previews
+            $transformation = new Transformation();
+            $transformation->addAdapter(new Preview());
+            $transformation->setInput($executionResponse['body']);
+            $transformation->setTraits($executionResponse['headers']);
+            if ($type === 'deployment' && $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)) {
@@ -373,32 +473,41 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw

            /** Update execution status */
            $status = $executionResponse['statusCode'] >= 500 ? 'failed' : 'completed';
-            $execution->setAttribute('status', $status);
-            $execution->setAttribute('responseStatusCode', $executionResponse['statusCode']);
-            $execution->setAttribute('responseHeaders', $headersFiltered);
+            if ($type === 'function') {
+                $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('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());
+                ->setAttribute('responseStatusCode', 500);
+
+            if ($type === 'function') {
+                $execution
+                    ->setAttribute('status', 'failed')
+                    ->setAttribute('errors', $th->getMessage() . '\nError Code: ' . $th->getCode());
+            }
            Console::error($th->getMessage());

            if ($th instanceof AppwriteException) {
                throw $th;
            }
        } finally {
-            $queueForFunctions
-                ->setType(Func::TYPE_ASYNC_WRITE)
-                ->setExecution($execution)
-                ->setProject($project)
-                ->trigger();
+            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);
+            }
        }

        $execution->setAttribute('logs', '');
@@ -420,7 +529,11 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
                $contentType = $header['value'];
            }

-            $response->setHeader($header['name'], $header['value']);
+            if (\strtolower($header['name']) === 'transfer-encoding') {
+                continue;
+            }
+
+            $response->addHeader(\strtolower($header['name']), $header['value']);
        }

        $response
@@ -434,19 +547,18 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            $fileSize = (\is_array($file['size']) && isset($file['size'][0])) ? $file['size'][0] : $file['size'];
        }

-        $queueForStatsUsage
+        $queueForUsage
            ->addMetric(METRIC_NETWORK_REQUESTS, 1)
            ->addMetric(METRIC_NETWORK_INBOUND, $request->getSize() + $fileSize)
            ->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize())
            ->addMetric(METRIC_EXECUTIONS, 1)
-            ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS), 1)
+            ->addMetric(str_replace('{functionInternalId}', $resource->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_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)))
+            ->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)))
            ->setProject($project)
-            ->trigger()
-        ;
+            ->trigger();

        return true;
    } elseif ($type === 'api') {
@@ -499,13 +611,13 @@ App::init()
    ->inject('localeCodes')
    ->inject('clients')
    ->inject('geodb')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('queueForEvents')
    ->inject('queueForCertificates')
    ->inject('queueForFunctions')
    ->inject('isResourceBlocked')
    ->inject('previewHostname')
-    ->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) {
+    ->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, Usage $queueForUsage, Event $queueForEvents, Certificate $queueForCertificates, Func $queueForFunctions, callable $isResourceBlocked, string $previewHostname) {
        /*
        * Appwrite Router
        */
@@ -513,7 +625,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)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname)) {
+                $utopia->getRoute()?->label('router', true);
                return;
            }
        }
@@ -582,12 +695,6 @@ App::init()
                        ]);
                    }

-                    $owner = '';
-                    $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
-                    if (!empty($functionsDomain) && \str_ends_with($domain->get(), $functionsDomain)) {
-                        $owner = 'Appwrite';
-                    }
-
                    if ($domainDocument->isEmpty()) {
                        $domainDocument = new Document([
                            // TODO: @christyjacob remove once we migrate the rules in 1.7.x
@@ -595,10 +702,8 @@ App::init()
                            'domain' => $domain->get(),
                            'resourceType' => 'api',
                            'status' => 'verifying',
-                            'projectId' => $console->getId(),
-                            'projectInternalId' => $console->getInternalId(),
-                            'owner' => $owner,
-                            'region' => $console->getAttribute('region')
+                            'projectId' => 'console',
+                            'projectInternalId' => 'console'
                        ]);

                        $domainDocument = $dbForPlatform->createDocument('rules', $domainDocument);
@@ -632,6 +737,12 @@ App::init()
        $validator = new Hostname($clients);
        if ($validator->isValid($origin)) {
            $refDomainOrigin = $origin;
+        } else {
+            // Auto-allow domains with linked rule
+            $rule = Authorization::skip(fn () => $dbForPlatform->getDocument('rules', md5($origin ?? '')));
+            if (!$rule->isEmpty() && $rule->getAttribute('projectInternalId') === $project->getInternalId()) {
+                $refDomainOrigin = $origin;
+            }
        }

        $refDomain = (!empty($protocol) ? $protocol : $request->getProtocol()) . '://' . $refDomainOrigin . (!empty($port) ? ':' . $port : '');
@@ -681,7 +792,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");
            }
        }

@@ -740,13 +851,12 @@ App::options()
    ->inject('dbForPlatform')
    ->inject('getProjectDB')
    ->inject('queueForEvents')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('queueForFunctions')
    ->inject('geodb')
    ->inject('isResourceBlocked')
    ->inject('previewHostname')
-    ->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) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
        /*
        * Appwrite Router
        */
@@ -754,7 +864,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)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname)) {
+                $utopia->getRoute()?->label('router', true);
                return;
            }
        }
@@ -769,16 +880,6 @@ 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()
@@ -789,8 +890,8 @@ App::error()
    ->inject('project')
    ->inject('logger')
    ->inject('log')
-    ->inject('queueForStatsUsage')
-    ->action(function (Throwable $error, App $utopia, Request $request, Response $response, Document $project, ?Logger $logger, Log $log, StatsUsage $queueForStatsUsage) {
+    ->inject('queueForUsage')
+    ->action(function (Throwable $error, App $utopia, Request $request, Response $response, Document $project, ?Logger $logger, Log $log, Usage $queueForUsage) {
        $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
        $route = $utopia->getRoute();
        $class = \get_class($error);
@@ -867,9 +968,11 @@ App::error()
            $publish = $error->getCode() === 0 || $error->getCode() >= 500;
        }

-        $providerConfig = System::getEnv('_APP_EXPERIMENT_LOGGING_CONFIG', '');
-        if (!empty($providerConfig) && $error->getCode() >= 400 && $error->getCode() < 500) {
+        if ($error->getCode() >= 400 && $error->getCode() < 500) {
            // Register error logger
+            $providerName = System::getEnv('_APP_EXPERIMENT_LOGGING_PROVIDER', '');
+            $providerConfig = System::getEnv('_APP_EXPERIMENT_LOGGING_CONFIG', '');
+
            try {
                $loggingProvider = new DSN($providerConfig ?? '');
                $providerName = $loggingProvider->getScheme();
@@ -891,10 +994,7 @@ App::error()
            }
        }

-        /**
-         * 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 ($publish && $project->getId() !== 'console') {
            if (!Auth::isPrivilegedUser(Authorization::getRoles())) {
                $fileSize = 0;
                $file = $request->getFiles('file');
@@ -902,17 +1002,18 @@ App::error()
                    $fileSize = (\is_array($file['size']) && isset($file['size'][0])) ? $file['size'][0] : $file['size'];
                }

-                $queueForStatsUsage
+                $queueForUsage
                    ->addMetric(METRIC_NETWORK_REQUESTS, 1)
                    ->addMetric(METRIC_NETWORK_INBOUND, $request->getSize() + $fileSize)
                    ->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize());
            }

-            $queueForStatsUsage
+            $queueForUsage
                ->setProject($project)
                ->trigger();
        }

+
        if ($logger && $publish) {
            try {
                /** @var Utopia\Database\Document $user */
@@ -1040,6 +1141,7 @@ App::error()
                ->setParam('trace', $output['trace'] ?? []);

            $response->html($layout->render());
+            return;
        }

        $response->dynamic(
@@ -1059,12 +1161,12 @@ App::get('/robots.txt')
    ->inject('dbForPlatform')
    ->inject('getProjectDB')
    ->inject('queueForEvents')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('queueForFunctions')
    ->inject('geodb')
    ->inject('isResourceBlocked')
    ->inject('previewHostname')
-    ->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) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
        $host = $request->getHostname() ?? '';
        $mainDomain = System::getEnv('_APP_DOMAIN', '');

@@ -1072,7 +1174,9 @@ App::get('/robots.txt')
            $template = new View(__DIR__ . '/../views/general/robots.phtml');
            $response->text($template->render(false));
        } else {
-            router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname);
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname)) {
+                $utopia->getRoute()?->label('router', true);
+            }
        }
    });

@@ -1087,12 +1191,12 @@ App::get('/humans.txt')
    ->inject('dbForPlatform')
    ->inject('getProjectDB')
    ->inject('queueForEvents')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('queueForFunctions')
    ->inject('geodb')
    ->inject('isResourceBlocked')
    ->inject('previewHostname')
-    ->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) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
        $host = $request->getHostname() ?? '';
        $mainDomain = System::getEnv('_APP_DOMAIN', '');

@@ -1100,7 +1204,9 @@ App::get('/humans.txt')
            $template = new View(__DIR__ . '/../views/general/humans.phtml');
            $response->text($template->render(false));
        } else {
-            router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname);
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname)) {
+                $utopia->getRoute()?->label('router', true);
+            }
        }
    });

@@ -1167,7 +1273,7 @@ App::get('/v1/ping')
    ->inject('dbForPlatform')
    ->inject('queueForEvents')
    ->action(function (Response $response, Document $project, Database $dbForPlatform, Event $queueForEvents) {
-        if ($project->isEmpty() || $project->getId() === 'console') {
+        if ($project->isEmpty()) {
            throw new AppwriteException(AppwriteException::PROJECT_NOT_FOUND);
        }

@@ -1192,14 +1298,26 @@ App::get('/v1/ping')
 App::wildcard()
    ->groups(['api'])
    ->label('scope', 'global')
-    ->action(function () {
+    ->inject('utopia')
+    ->action(function (App $utopia) {
+        $handeledByRouter = $utopia->getRoute()?->getLabel('router', false);
+        if ($handeledByRouter === true) {
+            return;
+        }
+
        throw new AppwriteException(AppwriteException::GENERAL_ROUTE_NOT_FOUND);
    });

 foreach (Config::getParam('services', []) as $service) {
-    include_once $service['controller'];
+    if (!empty($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()));
@@ -1,7 +1,8 @@
 <?php

+use Ahc\Jwt\JWT;
+use Ahc\Jwt\JWTException;
 use Appwrite\Auth\Auth;
-use Appwrite\Auth\Key;
 use Appwrite\Auth\MFA\Type\TOTP;
 use Appwrite\Event\Audit;
 use Appwrite\Event\Build;
@@ -11,11 +12,10 @@ use Appwrite\Event\Event;
 use Appwrite\Event\Func;
 use Appwrite\Event\Messaging;
 use Appwrite\Event\Realtime;
-use Appwrite\Event\StatsUsage;
+use Appwrite\Event\Usage;
 use Appwrite\Event\Webhook;
 use Appwrite\Extend\Exception;
 use Appwrite\Extend\Exception as AppwriteException;
-use Appwrite\SDK\Method;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use Utopia\Abuse\Abuse;
@@ -90,7 +90,7 @@ $eventDatabaseListener = function (Document $project, Document $document, Respon
    }
 };

-$usageDatabaseListener = function (string $event, Document $document, StatsUsage $queueForStatsUsage) {
+$usageDatabaseListener = function (string $event, Document $document, Usage $queueForUsage) {
    $value = 1;
    if ($event === Database::EVENT_DOCUMENT_DELETE) {
        $value = -1;
@@ -98,72 +98,89 @@ $usageDatabaseListener = function (string $event, Document $document, StatsUsage

    switch (true) {
        case $document->getCollection() === 'teams':
-            $queueForStatsUsage->addMetric(METRIC_TEAMS, $value); // per project
+            $queueForUsage
+                ->addMetric(METRIC_TEAMS, $value); // per project
            break;
        case $document->getCollection() === 'users':
-            $queueForStatsUsage->addMetric(METRIC_USERS, $value); // per project
+            $queueForUsage
+                ->addMetric(METRIC_USERS, $value); // per project
            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForStatsUsage->addReduce($document);
+                $queueForUsage
+                    ->addReduce($document);
            }
            break;
        case $document->getCollection() === 'sessions': // sessions
-            $queueForStatsUsage->addMetric(METRIC_SESSIONS, $value); //per project
+            $queueForUsage
+                ->addMetric(METRIC_SESSIONS, $value); //per project
            break;
        case $document->getCollection() === 'databases': // databases
-            $queueForStatsUsage->addMetric(METRIC_DATABASES, $value); // per project
+            $queueForUsage
+                ->addMetric(METRIC_DATABASES, $value); // per project

            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForStatsUsage->addReduce($document);
+                $queueForUsage
+                    ->addReduce($document);
            }
            break;
        case str_starts_with($document->getCollection(), 'database_') && !str_contains($document->getCollection(), 'collection'): //collections
            $parts = explode('_', $document->getCollection());
            $databaseInternalId = $parts[1] ?? 0;
-            $queueForStatsUsage
+            $queueForUsage
                ->addMetric(METRIC_COLLECTIONS, $value) // per project
-                ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, METRIC_DATABASE_ID_COLLECTIONS), $value);
+                ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, METRIC_DATABASE_ID_COLLECTIONS), $value)
+            ;

            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForStatsUsage->addReduce($document);
+                $queueForUsage
+                    ->addReduce($document);
            }
            break;
        case str_starts_with($document->getCollection(), 'database_') && str_contains($document->getCollection(), '_collection_'): //documents
            $parts = explode('_', $document->getCollection());
            $databaseInternalId   = $parts[1] ?? 0;
            $collectionInternalId = $parts[3] ?? 0;
-            $queueForStatsUsage
+            $queueForUsage
                ->addMetric(METRIC_DOCUMENTS, $value)  // per project
                ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, METRIC_DATABASE_ID_DOCUMENTS), $value) // per database
                ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$databaseInternalId, $collectionInternalId], METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS), $value);  // per collection
            break;
        case $document->getCollection() === 'buckets': //buckets
-            $queueForStatsUsage
+            $queueForUsage
                ->addMetric(METRIC_BUCKETS, $value); // per project
            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForStatsUsage
+                $queueForUsage
                    ->addReduce($document);
            }
            break;
        case str_starts_with($document->getCollection(), 'bucket_'): // files
            $parts = explode('_', $document->getCollection());
            $bucketInternalId  = $parts[1];
-            $queueForStatsUsage
+            $queueForUsage
                ->addMetric(METRIC_FILES, $value) // per project
                ->addMetric(METRIC_FILES_STORAGE, $document->getAttribute('sizeOriginal') * $value) // per project
                ->addMetric(str_replace('{bucketInternalId}', $bucketInternalId, METRIC_BUCKET_ID_FILES), $value) // per bucket
                ->addMetric(str_replace('{bucketInternalId}', $bucketInternalId, METRIC_BUCKET_ID_FILES_STORAGE), $document->getAttribute('sizeOriginal') * $value); // per bucket
            break;
        case $document->getCollection() === 'functions':
-            $queueForStatsUsage
+            $queueForUsage
                ->addMetric(METRIC_FUNCTIONS, $value); // per project

            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForStatsUsage
+                $queueForUsage
+                    ->addReduce($document);
+            }
+            break;
+        case $document->getCollection() === 'sites':
+            $queueForUsage
+                ->addMetric(METRIC_SITES, $value); // per project
+
+            if ($event === Database::EVENT_DOCUMENT_DELETE) {
+                $queueForUsage
                    ->addReduce($document);
            }
            break;
        case $document->getCollection() === 'deployments':
-            $queueForStatsUsage
+            $queueForUsage
                ->addMetric(METRIC_DEPLOYMENTS, $value) // per project
                ->addMetric(METRIC_DEPLOYMENTS_STORAGE, $document->getAttribute('size') * $value) // per project
                ->addMetric(str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getAttribute('resourceInternalId')], METRIC_FUNCTION_ID_DEPLOYMENTS), $value) // per function
@@ -187,79 +204,117 @@ App::init()
    ->inject('servers')
    ->inject('mode')
    ->inject('team')
-    ->inject('apiKey')
-    ->action(function (App $utopia, Request $request, Database $dbForPlatform, Database $dbForProject, Audit $queueForAudits, Document $project, Document $user, ?Document $session, array $servers, string $mode, Document $team, ?Key $apiKey) {
+    ->action(function (App $utopia, Request $request, Database $dbForPlatform, Database $dbForProject, Audit $queueForAudits, Document $project, Document $user, ?Document $session, array $servers, string $mode, Document $team) {
        $route = $utopia->getRoute();

        if ($project->isEmpty()) {
            throw new Exception(Exception::PROJECT_NOT_FOUND);
        }

+        /** Default role */
        $roles = Config::getParam('roles', []);
-
-        $role = $user->isEmpty()
+        $role = ($user->isEmpty())
            ? Role::guests()->toString()
            : Role::users()->toString();

+        /** Allowed Scopes for the role */
        $scopes = $roles[$role]['scopes'];

+        $apiKey = $request->getHeader('x-appwrite-key', '');
+
        // API Key authentication
        if (!empty($apiKey)) {
+            // Do not allow API key and session to be set at the same time
            if (!$user->isEmpty()) {
                throw new Exception(Exception::USER_API_KEY_AND_SESSION_SET);
            }
-            if ($apiKey->isExpired()) {
-                throw new Exception(Exception::PROJECT_KEY_EXPIRED);
+
+            // Remove after migration
+            if (!\str_contains($apiKey, '_')) {
+                $keyType = API_KEY_STANDARD;
+                $authKey = $apiKey;
+            } else {
+                [ $keyType, $authKey ] = \explode('_', $apiKey, 2);
            }

-            $role = $apiKey->getRole();
-            $scopes = $apiKey->getScopes();
+            if ($keyType === API_KEY_DYNAMIC) {
+                // Dynamic key

-            // Disable authorization checks for API keys
-            Authorization::setDefaultStatus(false);
+                $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 86400, 0);

-            if ($apiKey->getRole() === Auth::USER_ROLE_APPS) {
-                $user = new Document([
-                    '$id' => '',
-                    'status' => true,
-                    'type' => Auth::ACTIVITY_TYPE_APP,
-                    'email' => 'app.' . $project->getId() . '@service.' . $request->getHostname(),
-                    'password' => '',
-                    'name' => $apiKey->getName(),
-                ]);
+                try {
+                    $payload = $jwtObj->decode($authKey);
+                } catch (JWTException $error) {
+                    throw new Exception(Exception::API_KEY_EXPIRED);
+                }

-                $queueForAudits->setUser($user);
-            }
+                $projectId = $payload['projectId'] ?? '';
+                $tokenScopes = $payload['scopes'] ?? [];

-            if ($apiKey->getType() === API_KEY_STANDARD) {
-                $dbKey = $project->find(
-                    key: 'secret',
-                    find: $request->getHeader('x-appwrite-key', ''),
-                    subject: 'keys'
-                );
+                // JWT includes project ID for better security
+                if ($projectId === $project->getId()) {
+                    $user = new Document([
+                        '$id' => '',
+                        'status' => true,
+                        'type' => Auth::ACTIVITY_TYPE_APP,
+                        'email' => 'app.' . $project->getId() . '@service.' . $request->getHostname(),
+                        'password' => '',
+                        'name' => 'Dynamic Key',
+                    ]);

-                if ($dbKey) {
-                    $accessedAt = $dbKey->getAttribute('accessedAt', '');
+                    $role = Auth::USER_ROLE_APPS;
+                    $scopes = \array_merge($roles[$role]['scopes'], $tokenScopes);

+                    Authorization::setRole(Auth::USER_ROLE_APPS);
+                    Authorization::setDefaultStatus(false);  // Cancel security segmentation for API keys.
+
+                    $queueForAudits->setUser($user);
+                }
+            } elseif ($keyType === API_KEY_STANDARD) {
+                // No underline means no prefix. Backwards compatibility.
+                // Regular key
+
+                // Check if given key match project API keys
+                $key = $project->find('secret', $apiKey, 'keys');
+                if ($key) {
+                    $user = new Document([
+                        '$id' => '',
+                        'status' => true,
+                        'type' => Auth::ACTIVITY_TYPE_APP,
+                        'email' => 'app.' . $project->getId() . '@service.' . $request->getHostname(),
+                        'password' => '',
+                        'name' => $key->getAttribute('name', 'UNKNOWN'),
+                    ]);
+
+                    $role = Auth::USER_ROLE_APPS;
+                    $scopes = \array_merge($roles[$role]['scopes'], $key->getAttribute('scopes', []));
+
+                    $expire = $key->getAttribute('expire');
+                    if (!empty($expire) && $expire < DateTime::formatTz(DateTime::now())) {
+                        throw new Exception(Exception::PROJECT_KEY_EXPIRED);
+                    }
+
+                    Authorization::setRole(Auth::USER_ROLE_APPS);
+                    Authorization::setDefaultStatus(false);  // Cancel security segmentation for API keys.
+
+                    $accessedAt = $key->getAttribute('accessedAt', '');
                    if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_KEY_ACCESS)) > $accessedAt) {
-                        $dbKey->setAttribute('accessedAt', DateTime::now());
-                        $dbForPlatform->updateDocument('keys', $dbKey->getId(), $dbKey);
+                        $key->setAttribute('accessedAt', DateTime::now());
+                        $dbForPlatform->updateDocument('keys', $key->getId(), $key);
                        $dbForPlatform->purgeCachedDocument('projects', $project->getId());
                    }

                    $sdkValidator = new WhiteList($servers, true);
                    $sdk = $request->getHeader('x-sdk-name', 'UNKNOWN');
-
                    if ($sdkValidator->isValid($sdk)) {
-                        $sdks = $dbKey->getAttribute('sdks', []);
-
+                        $sdks = $key->getAttribute('sdks', []);
                        if (!in_array($sdk, $sdks)) {
-                            $sdks[] = $sdk;
-                            $dbKey->setAttribute('sdks', $sdks);
+                            array_push($sdks, $sdk);
+                            $key->setAttribute('sdks', $sdks);

                            /** Update access time as well */
-                            $dbKey->setAttribute('accessedAt', Datetime::now());
-                            $dbForPlatform->updateDocument('keys', $dbKey->getId(), $dbKey);
+                            $key->setAttribute('accessedAt', Datetime::now());
+                            $dbForPlatform->updateDocument('keys', $key->getId(), $key);
                            $dbForPlatform->purgeCachedDocument('projects', $project->getId());
                        }
                    }
@@ -267,7 +322,8 @@ App::init()
                    $queueForAudits->setUser($user);
                }
            }
-        } // Admin User Authentication
+        }
+        // Admin User Authentication
        elseif (($project->getId() === 'console' && !$team->isEmpty() && !$user->isEmpty()) || ($project->getId() !== 'console' && !$user->isEmpty() && $mode === APP_MODE_ADMIN)) {
            $teamId = $team->getId();
            $adminRoles = [];
@@ -283,7 +339,7 @@ App::init()
                throw new Exception(Exception::USER_UNAUTHORIZED);
            }

-            $scopes = []; // Reset scope if admin
+            $scopes = []; // reset scope if admin
            foreach ($adminRoles as $role) {
                $scopes = \array_merge($scopes, $roles[$role]['scopes']);
            }
@@ -298,7 +354,9 @@ App::init()
            Authorization::setRole($authRole);
        }

-        // Update project last activity
+        /**
+         * Update project last activity
+         */
        if (!$project->isEmpty() && $project->getId() !== 'console') {
            $accessedAt = $project->getAttribute('accessedAt', '');
            if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $accessedAt) {
@@ -307,7 +365,9 @@ App::init()
            }
        }

-        // Update user last activity
+        /**
+         * Update user last activity
+         */
        if (!empty($user->getId())) {
            $accessedAt = $user->getAttribute('accessedAt', '');
            if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_USER_ACCESS)) > $accessedAt) {
@@ -321,18 +381,18 @@ App::init()
            }
        }

+        /** Do not allow access to disabled services */
        /**
-         * @var ?Method $method
+         * @var ?\Appwrite\SDK\Method $method
         */
        $method = $route->getLabel('sdk', false);

-        if (\is_array($method)) {
+        if (is_array($method)) {
            $method = $method[0];
        }

        if (!empty($method)) {
            $namespace = $method->getNamespace();
-
            if (
                array_key_exists($namespace, $project->getAttribute('services', []))
                && !$project->getAttribute('services', [])[$namespace]
@@ -342,13 +402,13 @@ App::init()
            }
        }

-        // Do now allow access if scope is not allowed
+        /** Do now allow access if scope is not allowed */
        $scope = $route->getLabel('scope', 'none');
        if (!\in_array($scope, $scopes)) {
            throw new Exception(Exception::GENERAL_UNAUTHORIZED_SCOPE, $user->getAttribute('email', 'User') . ' (role: ' . \strtolower($roles[$role]['label']) . ') missing scope (' . $scope . ')');
        }

-        // Do not allow access to blocked accounts
+        /** Do not allow access to blocked accounts */
        if (false === $user->getAttribute('status')) { // Account is blocked
            throw new Exception(Exception::USER_BLOCKED);
        }
@@ -385,12 +445,11 @@ App::init()
    ->inject('queueForDeletes')
    ->inject('queueForDatabase')
    ->inject('queueForBuilds')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('dbForProject')
    ->inject('timelimit')
    ->inject('mode')
-    ->inject('apiKey')
-    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Publisher $publisher, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, StatsUsage $queueForStatsUsage, Database $dbForProject, callable $timelimit, string $mode, ?Key $apiKey) use ($usageDatabaseListener, $eventDatabaseListener) {
+    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Publisher $publisher, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Usage $queueForUsage, Database $dbForProject, callable $timelimit, string $mode) use ($usageDatabaseListener, $eventDatabaseListener) {

        $route = $utopia->getRoute();

@@ -421,7 +480,7 @@ App::init()
                ->setParam('{ip}', $request->getIP())
                ->setParam('{url}', $request->getHostname() . $route->getPath())
                ->setParam('{method}', $request->getMethod())
-                ->setParam('{chunkId}', (int)($start / ($end + 1 - $start)));
+                ->setParam('{chunkId}', (int) ($start / ($end + 1 - $start)));
            $timeLimitArray[] = $timeLimit;
        }

@@ -487,12 +546,6 @@ App::init()
            $queueForAudits->setUser($userClone);
        }

-        if (!empty($apiKey) && !empty($apiKey->getDisabledMetrics())) {
-            foreach ($apiKey->getDisabledMetrics() as $key) {
-                $queueForStatsUsage->disableMetric($key);
-            }
-        }
-
        $queueForDeletes->setProject($project);
        $queueForDatabase->setProject($project);
        $queueForBuilds->setProject($project);
@@ -506,8 +559,8 @@ App::init()
        $queueForRealtime = new Realtime();

        $dbForProject
-            ->on(Database::EVENT_DOCUMENT_CREATE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
-            ->on(Database::EVENT_DOCUMENT_DELETE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
+            ->on(Database::EVENT_DOCUMENT_CREATE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForUsage))
+            ->on(Database::EVENT_DOCUMENT_DELETE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForUsage))
            ->on(Database::EVENT_DOCUMENT_CREATE, 'create-trigger-events', fn ($event, $document) => $eventDatabaseListener(
                $project,
                $document,
@@ -534,9 +587,12 @@ 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)) {
+                    $isAPIKey = Auth::isAppUser(Authorization::getRoles());
+                    $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
+
+                    if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
                        throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
                    }

@@ -560,13 +616,11 @@ App::init()
                    if ($file->isEmpty()) {
                        throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
                    }
-                    //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));
-                        }
+
+                    $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));
                    }
                }

@@ -580,7 +634,8 @@ App::init()
                    ->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate')
                    ->addHeader('Pragma', 'no-cache')
                    ->addHeader('Expires', '0')
-                    ->addHeader('X-Appwrite-Cache', 'miss');
+                    ->addHeader('X-Appwrite-Cache', 'miss')
+                ;
            }
        }
    });
@@ -648,7 +703,7 @@ App::shutdown()
    ->inject('user')
    ->inject('queueForEvents')
    ->inject('queueForAudits')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('queueForDeletes')
    ->inject('queueForDatabase')
    ->inject('queueForBuilds')
@@ -657,7 +712,7 @@ App::shutdown()
    ->inject('queueForWebhooks')
    ->inject('queueForRealtime')
    ->inject('dbForProject')
-    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $queueForEvents, Audit $queueForAudits, StatsUsage $queueForStatsUsage, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Messaging $queueForMessaging, Func $queueForFunctions, Event $queueForWebhooks, Realtime $queueForRealtime, Database $dbForProject) use ($parseLabel) {
+    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $queueForEvents, Audit $queueForAudits, Usage $queueForUsage, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Messaging $queueForMessaging, Func $queueForFunctions, Event $queueForWebhooks, Realtime $queueForRealtime, Database $dbForProject) use ($parseLabel) {

        $responsePayload = $response->getPayload();

@@ -741,7 +796,6 @@ App::shutdown()
            foreach ($queueForEvents->getParams() as $key => $value) {
                $queueForAudits->setParam($key, $value);
            }
-
            $queueForAudits->trigger();
        }

@@ -761,7 +815,9 @@ App::shutdown()
            $queueForMessaging->trigger();
        }

-        // Cache label
+        /**
+         * Cache label
+         */
        $useCache = $route->getLabel('cache', false);
        if ($useCache) {
            $resource = $resourceType = null;
@@ -813,13 +869,13 @@ App::shutdown()
                    $fileSize = (\is_array($file['size']) && isset($file['size'][0])) ? $file['size'][0] : $file['size'];
                }

-                $queueForStatsUsage
+                $queueForUsage
                    ->addMetric(METRIC_NETWORK_REQUESTS, 1)
                    ->addMetric(METRIC_NETWORK_INBOUND, $request->getSize() + $fileSize)
                    ->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize());
            }

-            $queueForStatsUsage
+            $queueForUsage
                ->setProject($project)
                ->trigger();
        }
@@ -11,12 +11,13 @@ use Swoole\Http\Server;
 use Swoole\Process;
 use Swoole\Table;
 use Utopia\App;
-use Utopia\Audit\Adapter\Audit;
+use Utopia\Audit\Audit;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
+use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
@@ -155,79 +156,6 @@ function dispatch(Server $server, int $fd, int $type, $data = null): int

 include __DIR__ . '/controllers/general.php';

-function createDatabase(App $app, string $resourceKey, string $dbName, array $collections, mixed $pools, callable $extraSetup = null): void
-{
-    $max = 10;
-    $sleep = 1;
-    $attempts = 0;
-
-    do {
-        try {
-            $attempts++;
-            $resource = $app->getResource($resourceKey);
-            /* @var $database Database */
-            $database = is_callable($resource) ? $resource() : $resource;
-            break; // exit loop on success
-        } catch (\Exception $e) {
-            Console::warning("  └── Database not ready. Retrying connection ({$attempts})...");
-            $pools->reclaim();
-            if ($attempts >= $max) {
-                throw new \Exception('  └── Failed to connect to database: ' . $e->getMessage());
-            }
-            sleep($sleep);
-        }
-    } while ($attempts < $max);
-
-    Console::success("[Setup] - $dbName database init started...");
-
-    // Attempt to create the database
-    try {
-        Console::info("  └── Creating database: $dbName...");
-        $database->create();
-    } catch (\Exception $e) {
-        Console::info("  └── Skip: metadata table already exists");
-    }
-
-    // Process collections
-    foreach ($collections as $key => $collection) {
-        if (($collection['$collection'] ?? '') !== Database::METADATA) {
-            continue;
-        }
-
-        if (!$database->getCollection($key)->isEmpty()) {
-            continue;
-        }
-
-        Console::info("    └── Creating collection: {$collection['$id']}...");
-
-        $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'] ?? ''
-        ]), $collection['attributes']);
-
-        $indexes = array_map(fn ($index) => new Document([
-            '$id' => ID::custom($index['$id']),
-            'type' => $index['type'],
-            'attributes' => $index['attributes'],
-            'lengths' => $index['lengths'],
-            'orders' => $index['orders'],
-        ]), $collection['indexes']);
-
-        $database->createCollection($key, $attributes, $indexes);
-    }
-
-    if ($extraSetup) {
-        $extraSetup($database);
-    }
-}
-
 $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $register) {
    $app = new App('UTC');

@@ -236,73 +164,94 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
        /** @var Group $pools */
        App::setResource('pools', fn () => $pools);

+        // wait for database to be ready
+        $attempts = 0;
+        $max = 10;
+        $sleep = 1;
+
+        do {
+            try {
+                $attempts++;
+                $dbForPlatform = $app->getResource('dbForPlatform');
+                /** @var Utopia\Database\Database $dbForPlatform */
+                break; // leave the do-while if successful
+            } catch (\Throwable $e) {
+                Console::warning("Database not ready. Retrying connection ({$attempts})...");
+                if ($attempts >= $max) {
+                    throw new \Exception('Failed to connect to database: ' . $e->getMessage());
+                }
+                sleep($sleep);
+            }
+        } while ($attempts < $max);
+
+        Console::success('[Setup] - Server database init started...');
+
+        try {
+            Console::success('[Setup] - Creating console database...');
+            $dbForPlatform->create();
+        } catch (Duplicate) {
+            Console::success('[Setup] - Skip: metadata table already exists');
+        }
+
+        if ($dbForPlatform->getCollection(Audit::COLLECTION)->isEmpty()) {
+            $audit = new Audit($dbForPlatform);
+            $audit->setup();
+        }
+
        /** @var array $collections */
        $collections = Config::getParam('collections', []);
-
-        // create logs database first, `getLogsDB` is a callable.
-        createDatabase($app, 'getLogsDB', 'logs', $collections['logs'], $pools);
-
-        // create appwrite database, `dbForPlatform` is a direct access call.
-        createDatabase($app, 'dbForPlatform', 'appwrite', $collections['console'], $pools, function (Database $dbForPlatform) use ($collections) {
-            if ($dbForPlatform->getCollection(Audit::getCollection())->isEmpty()) {
-                $audit = new Audit($dbForPlatform);
-                $audit->setup();
+        $consoleCollections = $collections['console'];
+        foreach ($consoleCollections as $key => $collection) {
+            if (($collection['$collection'] ?? '') !== Database::METADATA) {
+                continue;
+            }
+            if (!$dbForPlatform->getCollection($key)->isEmpty()) {
+                continue;
            }

-            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'),
-                    '$collection' => ID::custom('buckets'),
-                    'name' => 'Default',
-                    'maximumFileSize' => (int) System::getEnv('_APP_STORAGE_LIMIT', 0),
-                    'allowedFileExtensions' => [],
-                    'enabled' => true,
-                    'compression' => 'gzip',
-                    'encryption' => true,
-                    'antivirus' => true,
-                    'fileSecurity' => true,
-                    '$permissions' => [
-                        Permission::create(Role::any()),
-                        Permission::read(Role::any()),
-                        Permission::update(Role::any()),
-                        Permission::delete(Role::any()),
-                    ],
-                    'search' => 'buckets Default',
-                ]));
+            Console::success('[Setup] - Creating console collection: ' . $collection['$id'] . '...');

-                $bucket = $dbForPlatform->getDocument('buckets', 'default');
+            $attributes = \array_map(fn ($attribute) => new Document($attribute), $collection['attributes']);
+            $indexes = \array_map(fn (array $index) => new Document($index), $collection['indexes']);

-                Console::info("    └── Creating files collection for default bucket...");
-                $files = $collections['buckets']['files'] ?? [];
-                if (empty($files)) {
-                    throw new Exception('Files collection is not configured.');
-                }
+            $dbForPlatform->createCollection($key, $attributes, $indexes);
+        }

-                $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']);
+        if ($dbForPlatform->getDocument('buckets', 'default')->isEmpty() && !$dbForPlatform->exists($dbForPlatform->getDatabase(), 'bucket_1')) {
+            Console::success('[Setup] - Creating default bucket...');
+            $dbForPlatform->createDocument('buckets', new Document([
+                '$id' => ID::custom('default'),
+                '$collection' => ID::custom('buckets'),
+                'name' => 'Default',
+                'maximumFileSize' => (int) System::getEnv('_APP_STORAGE_LIMIT', 0), // 10MB
+                'allowedFileExtensions' => [],
+                'enabled' => true,
+                'compression' => 'gzip',
+                'encryption' => true,
+                'antivirus' => true,
+                'fileSecurity' => true,
+                '$permissions' => [
+                    Permission::create(Role::any()),
+                    Permission::read(Role::any()),
+                    Permission::update(Role::any()),
+                    Permission::delete(Role::any()),
+                ],
+                'search' => 'buckets Default',
+            ]));

-                $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']);
+            $bucket = $dbForPlatform->getDocument('buckets', 'default');

-                $dbForPlatform->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes);
+            Console::success('[Setup] - Creating files collection for default bucket...');
+            $files = $collections['buckets']['files'] ?? [];
+            if (empty($files)) {
+                throw new Exception('Files collection is not configured.');
            }
-        });
+
+            $attributes = \array_map(fn ($attribute) => new Document($attribute), $files['attributes']);
+            $indexes = \array_map(fn (array $index) => new Document($index), $files['indexes']);
+
+            $dbForPlatform->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes);
+        }

        $projectCollections = $collections['projects'];
        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
@@ -330,11 +279,6 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
                Console::success('[Setup] - Skip: metadata table already exists');
            }

-            if ($dbForProject->getCollection(Audit::getCollection())->isEmpty()) {
-                $audit = new Audit($dbForProject);
-                $audit->setup();
-            }
-
            foreach ($projectCollections as $key => $collection) {
                if (($collection['$collection'] ?? '') !== Database::METADATA) {
                    continue;
@@ -353,6 +297,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
        }

        $pools->reclaim();
+
        Console::success('[Setup] - Server database init completed...');
    });

@@ -1,37 +0,0 @@
-<?php
-
-use Utopia\Config\Config;
-
-Config::load('events', __DIR__ . '/../config/events.php');
-Config::load('auth', __DIR__ . '/../config/auth.php');
-Config::load('apis', __DIR__ . '/../config/apis.php');  // List of APIs
-Config::load('errors', __DIR__ . '/../config/errors.php');
-Config::load('oAuthProviders', __DIR__ . '/../config/oAuthProviders.php');
-Config::load('platforms', __DIR__ . '/../config/platforms.php');
-Config::load('console', __DIR__ . '/../config/console.php');
-Config::load('collections', __DIR__ . '/../config/collections.php');
-Config::load('runtimes', __DIR__ . '/../config/runtimes.php');
-Config::load('runtimes-v2', __DIR__ . '/../config/runtimes-v2.php');
-Config::load('usage', __DIR__ . '/../config/usage.php');
-Config::load('roles', __DIR__ . '/../config/roles.php');  // User roles and scopes
-Config::load('scopes', __DIR__ . '/../config/scopes.php');  // User roles and scopes
-Config::load('services', __DIR__ . '/../config/services.php');  // List of services
-Config::load('variables', __DIR__ . '/../config/variables.php');  // List of env variables
-Config::load('regions', __DIR__ . '/../config/regions.php'); // List of available regions
-Config::load('avatar-browsers', __DIR__ . '/../config/avatars/browsers.php');
-Config::load('avatar-credit-cards', __DIR__ . '/../config/avatars/credit-cards.php');
-Config::load('avatar-flags', __DIR__ . '/../config/avatars/flags.php');
-Config::load('locale-codes', __DIR__ . '/../config/locale/codes.php');
-Config::load('locale-currencies', __DIR__ . '/../config/locale/currencies.php');
-Config::load('locale-eu', __DIR__ . '/../config/locale/eu.php');
-Config::load('locale-languages', __DIR__ . '/../config/locale/languages.php');
-Config::load('locale-phones', __DIR__ . '/../config/locale/phones.php');
-Config::load('locale-countries', __DIR__ . '/../config/locale/countries.php');
-Config::load('locale-continents', __DIR__ . '/../config/locale/continents.php');
-Config::load('locale-templates', __DIR__ . '/../config/locale/templates.php');
-Config::load('storage-logos', __DIR__ . '/../config/storage/logos.php');
-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('function-templates', __DIR__ . '/../config/function-templates.php');
@@ -1,239 +0,0 @@
-<?php
-
-use Appwrite\Functions\Specification;
-
-const APP_NAME = 'Appwrite';
-const APP_DOMAIN = 'appwrite.io';
-const APP_EMAIL_TEAM = 'team@localhost.test'; // Default email address
-const APP_EMAIL_SECURITY = ''; // Default security email address
-const APP_USERAGENT = APP_NAME . '-Server v%s. Please report abuse at %s';
-const APP_MODE_DEFAULT = 'default';
-const APP_MODE_ADMIN = 'admin';
-const APP_PAGING_LIMIT = 12;
-const APP_LIMIT_COUNT = 5000;
-const APP_LIMIT_USERS = 10_000;
-const APP_LIMIT_USER_PASSWORD_HISTORY = 20;
-const APP_LIMIT_USER_SESSIONS_MAX = 100;
-const APP_LIMIT_USER_SESSIONS_DEFAULT = 10;
-const APP_LIMIT_ANTIVIRUS = 20_000_000; //20MB
-const APP_LIMIT_ENCRYPTION = 20_000_000; //20MB
-const APP_LIMIT_COMPRESSION = 20_000_000; //20MB
-const APP_LIMIT_ARRAY_PARAMS_SIZE = 100; // Default maximum of how many elements can there be in API parameter that expects array value
-const APP_LIMIT_ARRAY_LABELS_SIZE = 1000; // Default maximum of how many labels elements can there be in API parameter that expects array value
-const APP_LIMIT_ARRAY_ELEMENT_SIZE = 4096; // Default maximum length of element in array parameter represented by maximum URL length.
-const APP_LIMIT_SUBQUERY = 1000;
-const APP_LIMIT_SUBSCRIBERS_SUBQUERY = 1_000_000;
-const APP_LIMIT_WRITE_RATE_DEFAULT = 60; // Default maximum write rate per rate period
-const APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT = 60; // Default maximum write rate period in seconds
-const APP_LIMIT_LIST_DEFAULT = 25; // Default maximum number of items to return in list API calls
-const APP_KEY_ACCESS = 24 * 60 * 60; // 24 hours
-const APP_USER_ACCESS = 24 * 60 * 60; // 24 hours
-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.6.2';
-const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
-const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
-const APP_DATABASE_ATTRIBUTE_IP = 'ip';
-const APP_DATABASE_ATTRIBUTE_DATETIME = 'datetime';
-const APP_DATABASE_ATTRIBUTE_URL = 'url';
-const APP_DATABASE_ATTRIBUTE_INT_RANGE = 'intRange';
-const APP_DATABASE_ATTRIBUTE_FLOAT_RANGE = 'floatRange';
-const APP_DATABASE_ATTRIBUTE_STRING_MAX_LENGTH = 1_073_741_824; // 2^32 bits / 4 bits per char
-const APP_DATABASE_TIMEOUT_MILLISECONDS_API = 15 * 1000; // 15 seconds
-const APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER = 300 * 1000; // 5 minutes
-const APP_DATABASE_TIMEOUT_MILLISECONDS_TASK = 300 * 1000; // 5 minutes
-const APP_DATABASE_QUERY_MAX_VALUES = 500;
-const APP_STORAGE_UPLOADS = '/storage/uploads';
-const APP_STORAGE_FUNCTIONS = '/storage/functions';
-const APP_STORAGE_BUILDS = '/storage/builds';
-const APP_STORAGE_CACHE = '/storage/cache';
-const APP_STORAGE_CERTIFICATES = '/storage/certificates';
-const APP_STORAGE_CONFIG = '/storage/config';
-const APP_STORAGE_READ_BUFFER = 20 * (1000 * 1000); //20MB other names `APP_STORAGE_MEMORY_LIMIT`, `APP_STORAGE_MEMORY_BUFFER`, `APP_STORAGE_READ_LIMIT`, `APP_STORAGE_BUFFER_LIMIT`
-const APP_SOCIAL_TWITTER = 'https://twitter.com/appwrite';
-const APP_SOCIAL_TWITTER_HANDLE = 'appwrite';
-const APP_SOCIAL_FACEBOOK = 'https://www.facebook.com/appwrite.io';
-const APP_SOCIAL_LINKEDIN = 'https://www.linkedin.com/company/appwrite';
-const APP_SOCIAL_INSTAGRAM = 'https://www.instagram.com/appwrite.io';
-const APP_SOCIAL_GITHUB = 'https://github.com/appwrite';
-const APP_SOCIAL_DISCORD = 'https://appwrite.io/discord';
-const APP_SOCIAL_DISCORD_CHANNEL = '564160730845151244';
-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_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';
-
-// Database Reconnect
-const DATABASE_RECONNECT_SLEEP = 2;
-const DATABASE_RECONNECT_MAX_ATTEMPTS = 10;
-
-// Database Worker Types
-const DATABASE_TYPE_CREATE_ATTRIBUTE = 'createAttribute';
-const DATABASE_TYPE_CREATE_INDEX = 'createIndex';
-const DATABASE_TYPE_DELETE_ATTRIBUTE = 'deleteAttribute';
-const DATABASE_TYPE_DELETE_INDEX = 'deleteIndex';
-const DATABASE_TYPE_DELETE_COLLECTION = 'deleteCollection';
-const DATABASE_TYPE_DELETE_DATABASE = 'deleteDatabase';
-
-// Build Worker Types
-const BUILD_TYPE_DEPLOYMENT = 'deployment';
-const BUILD_TYPE_RETRY = 'retry';
-
-// Deletion Types
-const DELETE_TYPE_DATABASES = 'databases';
-const DELETE_TYPE_DOCUMENT = 'document';
-const DELETE_TYPE_COLLECTIONS = 'collections';
-const DELETE_TYPE_PROJECTS = 'projects';
-const DELETE_TYPE_FUNCTIONS = 'functions';
-const DELETE_TYPE_DEPLOYMENTS = 'deployments';
-const DELETE_TYPE_USERS = 'users';
-const DELETE_TYPE_TEAM_PROJECTS = 'teams_projects';
-const DELETE_TYPE_EXECUTIONS = 'executions';
-const DELETE_TYPE_AUDIT = 'audit';
-const DELETE_TYPE_ABUSE = 'abuse';
-const DELETE_TYPE_USAGE = 'usage';
-const DELETE_TYPE_REALTIME = 'realtime';
-const DELETE_TYPE_BUCKETS = 'buckets';
-const DELETE_TYPE_INSTALLATIONS = 'installations';
-const DELETE_TYPE_RULES = 'rules';
-const DELETE_TYPE_SESSIONS = 'sessions';
-const DELETE_TYPE_CACHE_BY_TIMESTAMP = 'cacheByTimeStamp';
-const DELETE_TYPE_CACHE_BY_RESOURCE  = 'cacheByResource';
-const DELETE_TYPE_SCHEDULES = 'schedules';
-const DELETE_TYPE_TOPIC = 'topic';
-const DELETE_TYPE_TARGET = 'target';
-const DELETE_TYPE_EXPIRED_TARGETS = 'invalid_targets';
-const DELETE_TYPE_SESSION_TARGETS = 'session_targets';
-const DELETE_TYPE_MAINTENANCE = 'maintenance';
-
-// Message types
-const MESSAGE_SEND_TYPE_INTERNAL = 'internal';
-const MESSAGE_SEND_TYPE_EXTERNAL = 'external';
-// Mail Types
-const MAIL_TYPE_VERIFICATION = 'verification';
-const MAIL_TYPE_MAGIC_SESSION = 'magicSession';
-const MAIL_TYPE_RECOVERY = 'recovery';
-const MAIL_TYPE_INVITATION = 'invitation';
-const MAIL_TYPE_CERTIFICATE = 'certificate';
-// Auth Types
-const APP_AUTH_TYPE_SESSION = 'Session';
-const APP_AUTH_TYPE_JWT = 'JWT';
-const APP_AUTH_TYPE_KEY = 'Key';
-const APP_AUTH_TYPE_ADMIN = 'Admin';
-// Response related
-const MAX_OUTPUT_CHUNK_SIZE = 10 * 1024 * 1024; // 10MB
-// Function headers
-const FUNCTION_ALLOWLIST_HEADERS_REQUEST = ['content-type', 'agent', 'content-length', 'host'];
-const FUNCTION_ALLOWLIST_HEADERS_RESPONSE = ['content-type', 'content-length'];
-// Message types
-const MESSAGE_TYPE_EMAIL = 'email';
-const MESSAGE_TYPE_SMS = 'sms';
-const MESSAGE_TYPE_PUSH = 'push';
-// API key types
-const API_KEY_STANDARD = 'standard';
-const API_KEY_DYNAMIC = 'dynamic';
-// Usage metrics
-const METRIC_TEAMS = 'teams';
-const METRIC_USERS = 'users';
-const METRIC_WEBHOOKS_SENT  = 'webhooks.events.sent';
-const METRIC_WEBHOOKS_FAILED  = 'webhooks.events.failed';
-const METRIC_WEBHOOK_ID_SENT = '{webhookInternalId}.webhooks.events.sent';
-const METRIC_WEBHOOK_ID_FAILED = '{webhookInternalId}.webhooks.events.failed';
-const METRIC_AUTH_METHOD_PHONE  = 'auth.method.phone';
-const METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE  = METRIC_AUTH_METHOD_PHONE . '.{countryCode}';
-const METRIC_MESSAGES = 'messages';
-const METRIC_MESSAGES_SENT = METRIC_MESSAGES . '.sent';
-const METRIC_MESSAGES_FAILED = METRIC_MESSAGES . '.failed';
-const METRIC_MESSAGES_TYPE = METRIC_MESSAGES . '.{type}';
-const METRIC_MESSAGES_TYPE_SENT  = METRIC_MESSAGES . '.{type}.sent';
-const METRIC_MESSAGES_TYPE_FAILED  = METRIC_MESSAGES . '.{type}.failed';
-const METRIC_MESSAGES_TYPE_PROVIDER = METRIC_MESSAGES . '.{type}.{provider}';
-const METRIC_MESSAGES_TYPE_PROVIDER_SENT  = METRIC_MESSAGES . '.{type}.{provider}.sent';
-const METRIC_MESSAGES_TYPE_PROVIDER_FAILED  = METRIC_MESSAGES . '.{type}.{provider}.failed';
-const METRIC_SESSIONS  = 'sessions';
-const METRIC_DATABASES = 'databases';
-const METRIC_COLLECTIONS = 'collections';
-const METRIC_DATABASES_STORAGE = 'databases.storage';
-const METRIC_DATABASE_ID_COLLECTIONS = '{databaseInternalId}.collections';
-const METRIC_DATABASE_ID_STORAGE = '{databaseInternalId}.databases.storage';
-const METRIC_DOCUMENTS = 'documents';
-const METRIC_DATABASE_ID_DOCUMENTS = '{databaseInternalId}.documents';
-const METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS = '{databaseInternalId}.{collectionInternalId}.documents';
-const METRIC_DATABASE_ID_COLLECTION_ID_STORAGE = '{databaseInternalId}.{collectionInternalId}.databases.storage';
-const METRIC_DATABASES_OPERATIONS_READS  = 'databases.operations.reads';
-const METRIC_DATABASE_ID_OPERATIONS_READS = '{databaseInternalId}.databases.operations.reads';
-const METRIC_DATABASES_OPERATIONS_WRITES  = 'databases.operations.writes';
-const METRIC_DATABASE_ID_OPERATIONS_WRITES = '{databaseInternalId}.databases.operations.writes';
-const METRIC_BUCKETS = 'buckets';
-const METRIC_FILES  = 'files';
-const METRIC_FILES_STORAGE  = 'files.storage';
-const METRIC_FILES_TRANSFORMATIONS  = 'files.transformations';
-const METRIC_BUCKET_ID_FILES_TRANSFORMATIONS  = '{bucketInternalId}.files.transformations';
-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_FUNCTIONS  = 'functions';
-const METRIC_DEPLOYMENTS  = 'deployments';
-const METRIC_DEPLOYMENTS_STORAGE  = 'deployments.storage';
-const METRIC_BUILDS  = 'builds';
-const METRIC_BUILDS_SUCCESS  = 'builds.success';
-const METRIC_BUILDS_FAILED  = 'builds.failed';
-const METRIC_BUILDS_STORAGE  = 'builds.storage';
-const METRIC_BUILDS_COMPUTE  = 'builds.compute';
-const METRIC_BUILDS_COMPUTE_SUCCESS  = 'builds.compute.success';
-const METRIC_BUILDS_COMPUTE_FAILED  = 'builds.compute.failed';
-const METRIC_BUILDS_MB_SECONDS = 'builds.mbSeconds';
-const METRIC_FUNCTION_ID_BUILDS  = '{functionInternalId}.builds';
-const METRIC_FUNCTION_ID_BUILDS_SUCCESS  = '{functionInternalId}.builds.success';
-const METRIC_FUNCTION_ID_BUILDS_FAILED  = '{functionInternalId}.builds.failed';
-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_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_NETWORK_REQUESTS  = 'network.requests';
-const METRIC_NETWORK_INBOUND  = 'network.inbound';
-const METRIC_NETWORK_OUTBOUND  = 'network.outbound';
-const METRIC_MAU = 'users.mau';
-const METRIC_DAU = 'users.dau';
-const METRIC_WAU = 'users.wau';
-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_DOMAINS = 'domains';
-const METRIC_RESOURCE_TYPE_ID_BUILDS  = '{resourceType}.{resourceInternalId}.builds';
-const METRIC_RESOURCE_TYPE_ID_BUILDS_STORAGE = '{resourceType}.{resourceInternalId}.builds.storage';
-const METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS  = '{resourceType}.{resourceInternalId}.deployments';
-const METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS_STORAGE  = '{resourceType}.{resourceInternalId}.deployments.storage';
-
-// Resource types
-
-const RESOURCE_TYPE_PROJECTS = 'projects';
-const RESOURCE_TYPE_FUNCTIONS = 'functions';
-const RESOURCE_TYPE_DATABASES = 'databases';
-const RESOURCE_TYPE_BUCKETS = 'buckets';
-const RESOURCE_TYPE_PROVIDERS = 'providers';
-const RESOURCE_TYPE_TOPICS = 'topics';
-const RESOURCE_TYPE_SUBSCRIBERS = 'subscribers';
-const RESOURCE_TYPE_MESSAGES = 'messages';
@@ -1,404 +0,0 @@
-<?php
-
-use Appwrite\OpenSSL\OpenSSL;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
-use Utopia\Database\Query;
-use Utopia\Database\Validator\Authorization;
-use Utopia\System\System;
-
-Database::addFilter(
-    'casting',
-    function (mixed $value) {
-        return json_encode(['value' => $value], JSON_PRESERVE_ZERO_FRACTION);
-    },
-    function (mixed $value) {
-        if (is_null($value)) {
-            return;
-        }
-
-        return json_decode($value, true)['value'];
-    }
-);
-
-Database::addFilter(
-    'enum',
-    function (mixed $value, Document $attribute) {
-        if ($attribute->isSet('elements')) {
-            $attribute->removeAttribute('elements');
-        }
-
-        return $value;
-    },
-    function (mixed $value, Document $attribute) {
-        $formatOptions = \json_decode($attribute->getAttribute('formatOptions', '[]'), true);
-        if (isset($formatOptions['elements'])) {
-            $attribute->setAttribute('elements', $formatOptions['elements']);
-        }
-
-        return $value;
-    }
-);
-
-Database::addFilter(
-    'range',
-    function (mixed $value, Document $attribute) {
-        if ($attribute->isSet('min')) {
-            $attribute->removeAttribute('min');
-        }
-        if ($attribute->isSet('max')) {
-            $attribute->removeAttribute('max');
-        }
-
-        return $value;
-    },
-    function (mixed $value, Document $attribute) {
-        $formatOptions = json_decode($attribute->getAttribute('formatOptions', '[]'), true);
-        if (isset($formatOptions['min']) || isset($formatOptions['max'])) {
-            $attribute
-                ->setAttribute('min', $formatOptions['min'])
-                ->setAttribute('max', $formatOptions['max']);
-        }
-
-        return $value;
-    }
-);
-
-Database::addFilter(
-    'subQueryAttributes',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        $attributes = $database->find('attributes', [
-            Query::equal('collectionInternalId', [$document->getInternalId()]),
-            Query::equal('databaseInternalId', [$document->getAttribute('databaseInternalId')]),
-            Query::limit($database->getLimitForAttributes()),
-        ]);
-
-        foreach ($attributes as $attribute) {
-            if ($attribute->getAttribute('type') === Database::VAR_RELATIONSHIP) {
-                $options = $attribute->getAttribute('options');
-                foreach ($options as $key => $value) {
-                    $attribute->setAttribute($key, $value);
-                }
-                $attribute->removeAttribute('options');
-            }
-        }
-
-        return $attributes;
-    }
-);
-
-Database::addFilter(
-    'subQueryIndexes',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return $database
-            ->find('indexes', [
-                Query::equal('collectionInternalId', [$document->getInternalId()]),
-                Query::equal('databaseInternalId', [$document->getAttribute('databaseInternalId')]),
-                Query::limit($database->getLimitForIndexes()),
-            ]);
-    }
-);
-
-Database::addFilter(
-    'subQueryPlatforms',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return $database
-            ->find('platforms', [
-                Query::equal('projectInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBQUERY),
-            ]);
-    }
-);
-
-Database::addFilter(
-    'subQueryKeys',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return $database
-            ->find('keys', [
-                Query::equal('projectInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBQUERY),
-            ]);
-    }
-);
-
-Database::addFilter(
-    'subQueryWebhooks',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return $database
-            ->find('webhooks', [
-                Query::equal('projectInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBQUERY),
-            ]);
-    }
-);
-
-Database::addFilter(
-    'subQuerySessions',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return Authorization::skip(fn () => $database->find('sessions', [
-            Query::equal('userInternalId', [$document->getInternalId()]),
-            Query::limit(APP_LIMIT_SUBQUERY),
-        ]));
-    }
-);
-
-Database::addFilter(
-    'subQueryTokens',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return Authorization::skip(fn () => $database
-            ->find('tokens', [
-                Query::equal('userInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBQUERY),
-            ]));
-    }
-);
-
-Database::addFilter(
-    'subQueryChallenges',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return Authorization::skip(fn () => $database
-            ->find('challenges', [
-                Query::equal('userInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBQUERY),
-            ]));
-    }
-);
-
-Database::addFilter(
-    'subQueryAuthenticators',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return Authorization::skip(fn () => $database
-            ->find('authenticators', [
-                Query::equal('userInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBQUERY),
-            ]));
-    }
-);
-
-Database::addFilter(
-    'subQueryMemberships',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return Authorization::skip(fn () => $database
-            ->find('memberships', [
-                Query::equal('userInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBQUERY),
-            ]));
-    }
-);
-
-Database::addFilter(
-    'subQueryVariables',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return $database
-            ->find('variables', [
-                Query::equal('resourceInternalId', [$document->getInternalId()]),
-                Query::equal('resourceType', ['function']),
-                Query::limit(APP_LIMIT_SUBQUERY),
-            ]);
-    }
-);
-
-Database::addFilter(
-    'encrypt',
-    function (mixed $value) {
-        $key = System::getEnv('_APP_OPENSSL_KEY_V1');
-        $iv = OpenSSL::randomPseudoBytes(OpenSSL::cipherIVLength(OpenSSL::CIPHER_AES_128_GCM));
-        $tag = null;
-
-        return json_encode([
-            'data' => OpenSSL::encrypt($value, OpenSSL::CIPHER_AES_128_GCM, $key, 0, $iv, $tag),
-            'method' => OpenSSL::CIPHER_AES_128_GCM,
-            'iv' => \bin2hex($iv),
-            'tag' => \bin2hex($tag ?? ''),
-            'version' => '1',
-        ]);
-    },
-    function (mixed $value) {
-        if (is_null($value)) {
-            return;
-        }
-        $value = json_decode($value, true);
-        $key = System::getEnv('_APP_OPENSSL_KEY_V' . $value['version']);
-
-        return OpenSSL::decrypt($value['data'], $value['method'], $key, 0, hex2bin($value['iv']), hex2bin($value['tag']));
-    }
-);
-
-Database::addFilter(
-    'subQueryProjectVariables',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return $database
-            ->find('variables', [
-                Query::equal('resourceType', ['project']),
-                Query::limit(APP_LIMIT_SUBQUERY)
-            ]);
-    }
-);
-
-Database::addFilter(
-    'userSearch',
-    function (mixed $value, Document $user) {
-        $searchValues = [
-            $user->getId(),
-            $user->getAttribute('email', ''),
-            $user->getAttribute('name', ''),
-            $user->getAttribute('phone', '')
-        ];
-
-        foreach ($user->getAttribute('labels', []) as $label) {
-            $searchValues[] = 'label:' . $label;
-        }
-
-        $search = implode(' ', \array_filter($searchValues));
-
-        return $search;
-    },
-    function (mixed $value) {
-        return $value;
-    }
-);
-
-Database::addFilter(
-    'subQueryTargets',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return Authorization::skip(fn () => $database
-            ->find('targets', [
-                Query::equal('userInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBQUERY)
-            ]));
-    }
-);
-
-Database::addFilter(
-    'subQueryTopicTargets',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        $targetIds = Authorization::skip(fn () => \array_map(
-            fn ($document) => $document->getAttribute('targetInternalId'),
-            $database->find('subscribers', [
-                Query::equal('topicInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBSCRIBERS_SUBQUERY)
-            ])
-        ));
-        if (\count($targetIds) > 0) {
-            return $database->skipValidation(fn () => $database->find('targets', [
-                Query::equal('$internalId', $targetIds)
-            ]));
-        }
-        return [];
-    }
-);
-
-Database::addFilter(
-    'providerSearch',
-    function (mixed $value, Document $provider) {
-        $searchValues = [
-            $provider->getId(),
-            $provider->getAttribute('name', ''),
-            $provider->getAttribute('provider', ''),
-            $provider->getAttribute('type', '')
-        ];
-
-        $search = \implode(' ', \array_filter($searchValues));
-
-        return $search;
-    },
-    function (mixed $value) {
-        return $value;
-    }
-);
-
-Database::addFilter(
-    'topicSearch',
-    function (mixed $value, Document $topic) {
-        $searchValues = [
-            $topic->getId(),
-            $topic->getAttribute('name', ''),
-            $topic->getAttribute('description', ''),
-        ];
-
-        $search = \implode(' ', \array_filter($searchValues));
-
-        return $search;
-    },
-    function (mixed $value) {
-        return $value;
-    }
-);
-
-Database::addFilter(
-    'messageSearch',
-    function (mixed $value, Document $message) {
-        $searchValues = [
-            $message->getId(),
-            $message->getAttribute('description', ''),
-            $message->getAttribute('status', ''),
-        ];
-
-        $data = \json_decode($message->getAttribute('data', []), true);
-        $providerType = $message->getAttribute('providerType', '');
-
-        switch ($providerType) {
-            case MESSAGE_TYPE_EMAIL:
-                $searchValues[] = $data['subject'];
-                $searchValues[] = MESSAGE_TYPE_EMAIL;
-                break;
-            case MESSAGE_TYPE_SMS:
-                $searchValues[] = $data['content'];
-                $searchValues[] = MESSAGE_TYPE_SMS;
-                break;
-            case MESSAGE_TYPE_PUSH:
-                $searchValues[] = $data['title'] ?? '';
-                $searchValues[] = MESSAGE_TYPE_PUSH;
-                break;
-        }
-
-        $search = \implode(' ', \array_filter($searchValues));
-
-        return $search;
-    },
-    function (mixed $value) {
-        return $value;
-    }
-);
@@ -1,43 +0,0 @@
-<?php
-
-use Appwrite\Network\Validator\Email;
-use Utopia\Database\Database;
-use Utopia\Database\Validator\Datetime as DatetimeValidator;
-use Utopia\Database\Validator\Structure;
-use Utopia\Validator\IP;
-use Utopia\Validator\Range;
-use Utopia\Validator\URL;
-use Utopia\Validator\WhiteList;
-
-Structure::addFormat(APP_DATABASE_ATTRIBUTE_EMAIL, function () {
-    return new Email();
-}, Database::VAR_STRING);
-
-Structure::addFormat(APP_DATABASE_ATTRIBUTE_DATETIME, function () {
-    return new DatetimeValidator();
-}, Database::VAR_DATETIME);
-
-Structure::addFormat(APP_DATABASE_ATTRIBUTE_ENUM, function ($attribute) {
-    $elements = $attribute['formatOptions']['elements'] ?? [];
-    return new WhiteList($elements, true);
-}, Database::VAR_STRING);
-
-Structure::addFormat(APP_DATABASE_ATTRIBUTE_IP, function () {
-    return new IP();
-}, Database::VAR_STRING);
-
-Structure::addFormat(APP_DATABASE_ATTRIBUTE_URL, function () {
-    return new URL();
-}, Database::VAR_STRING);
-
-Structure::addFormat(APP_DATABASE_ATTRIBUTE_INT_RANGE, function ($attribute) {
-    $min = $attribute['formatOptions']['min'] ?? -INF;
-    $max = $attribute['formatOptions']['max'] ?? INF;
-    return new Range($min, $max, Range::TYPE_INTEGER);
-}, Database::VAR_INTEGER);
-
-Structure::addFormat(APP_DATABASE_ATTRIBUTE_FLOAT_RANGE, function ($attribute) {
-    $min = $attribute['formatOptions']['min'] ?? -INF;
-    $max = $attribute['formatOptions']['max'] ?? INF;
-    return new Range($min, $max, Range::TYPE_FLOAT);
-}, Database::VAR_FLOAT);
@@ -1,23 +0,0 @@
-<?php
-
-use Utopia\Config\Config;
-use Utopia\Locale\Locale;
-
-Locale::$exceptions = false;
-
-$locales = Config::getParam('locale-codes', []);
-
-foreach ($locales as $locale) {
-    $code = $locale['code'];
-
-    $path = __DIR__ . '/../config/locale/translations/' . $code . '.json';
-
-    if (!\file_exists($path)) {
-        $path = __DIR__ . '/../config/locale/translations/' . \substr($code, 0, 2) . '.json'; // if `ar-ae` doesn't exist, look for `ar`
-        if (!\file_exists($path)) {
-            $path = __DIR__ . '/../config/locale/translations/en.json'; // if none translation exists, use default from `en.json`
-        }
-    }
-
-    Locale::setLanguageFromJSON($code, $path);
-}
@@ -1,340 +0,0 @@
-<?php
-
-use Appwrite\Extend\Exception;
-use Appwrite\GraphQL\Promises\Adapter\Swoole;
-use Appwrite\Hooks\Hooks;
-use Appwrite\PubSub\Adapter\Redis as PubSub;
-use Appwrite\URL\URL as AppwriteURL;
-use MaxMind\Db\Reader;
-use PHPMailer\PHPMailer\PHPMailer;
-use Swoole\Database\PDOProxy;
-use Utopia\App;
-use Utopia\Cache\Adapter\Redis as RedisCache;
-use Utopia\CLI\Console;
-use Utopia\Config\Config;
-use Utopia\Database\Adapter\MariaDB;
-use Utopia\Database\Adapter\MySQL;
-use Utopia\Database\Adapter\SQL;
-use Utopia\Domains\Validator\PublicDomain;
-use Utopia\DSN\DSN;
-use Utopia\Logger\Adapter\AppSignal;
-use Utopia\Logger\Adapter\LogOwl;
-use Utopia\Logger\Adapter\Raygun;
-use Utopia\Logger\Adapter\Sentry;
-use Utopia\Logger\Logger;
-use Utopia\Pools\Group;
-use Utopia\Pools\Pool;
-use Utopia\Queue;
-use Utopia\Registry\Registry;
-use Utopia\System\System;
-
-$register = new Registry();
-
-App::setMode(System::getEnv('_APP_ENV', App::MODE_TYPE_PRODUCTION));
-
-if (!App::isProduction()) {
-    // Allow specific domains to skip public domain validation in dev environment
-    // Useful for existing tests involving webhooks
-    PublicDomain::allow(['request-catcher']);
-}
-$register->set('logger', function () {
-    // Register error logger
-    $providerName = System::getEnv('_APP_LOGGING_PROVIDER', '');
-    $providerConfig = System::getEnv('_APP_LOGGING_CONFIG', '');
-
-    if (empty($providerConfig)) {
-        return;
-    }
-
-    try {
-        $loggingProvider = new DSN($providerConfig ?? '');
-
-        $providerName = $loggingProvider->getScheme();
-        $providerConfig = match ($providerName) {
-            'sentry' => ['key' => $loggingProvider->getPassword(), 'projectId' => $loggingProvider->getUser() ?? '', 'host' => 'https://' . $loggingProvider->getHost()],
-            'logowl' => ['ticket' => $loggingProvider->getUser() ?? '', 'host' => $loggingProvider->getHost()],
-            default => ['key' => $loggingProvider->getHost()],
-        };
-    } catch (Throwable $th) {
-        // Fallback for older Appwrite versions up to 1.5.x that use _APP_LOGGING_PROVIDER and _APP_LOGGING_CONFIG environment variables
-        Console::warning('Using deprecated logging configuration. Please update your configuration to use DSN format.' . $th->getMessage());
-        $configChunks = \explode(";", $providerConfig);
-
-        $providerConfig = match ($providerName) {
-            'sentry' => [ 'key' => $configChunks[0], 'projectId' => $configChunks[1] ?? '', 'host' => '',],
-            'logowl' => ['ticket' => $configChunks[0] ?? '', 'host' => ''],
-            default => ['key' => $providerConfig],
-        };
-    }
-
-    if (empty($providerName) || empty($providerConfig)) {
-        return;
-    }
-
-    if (!Logger::hasProvider($providerName)) {
-        throw new Exception(Exception::GENERAL_SERVER_ERROR, "Logging provider not supported. Logging is disabled");
-    }
-
-    try {
-        $adapter = match ($providerName) {
-            'sentry' => new Sentry($providerConfig['projectId'], $providerConfig['key'], $providerConfig['host']),
-            'logowl' => new LogOwl($providerConfig['ticket'], $providerConfig['host']),
-            'raygun' => new Raygun($providerConfig['key']),
-            'appsignal' => new AppSignal($providerConfig['key']),
-            default => null
-        };
-    } catch (Throwable $th) {
-        $adapter = null;
-    }
-
-    if ($adapter === null) {
-        Console::error("Logging provider not supported. Logging is disabled");
-        return;
-    }
-
-    return new Logger($adapter);
-});
-
-$register->set('pools', function () {
-    $group = new Group();
-
-    $fallbackForDB = 'db_main=' . AppwriteURL::unparse([
-        'scheme' => 'mariadb',
-        'host' => System::getEnv('_APP_DB_HOST', 'mariadb'),
-        'port' => System::getEnv('_APP_DB_PORT', '3306'),
-        'user' => System::getEnv('_APP_DB_USER', ''),
-        'pass' => System::getEnv('_APP_DB_PASS', ''),
-        'path' => System::getEnv('_APP_DB_SCHEMA', ''),
-    ]);
-    $fallbackForRedis = 'redis_main=' . AppwriteURL::unparse([
-        'scheme' => 'redis',
-        'host' => System::getEnv('_APP_REDIS_HOST', 'redis'),
-        'port' => System::getEnv('_APP_REDIS_PORT', '6379'),
-        'user' => System::getEnv('_APP_REDIS_USER', ''),
-        'pass' => System::getEnv('_APP_REDIS_PASS', ''),
-    ]);
-
-    $connections = [
-        'console' => [
-            'type' => 'database',
-            'dsns' => $fallbackForDB,
-            'multiple' => false,
-            'schemes' => ['mariadb', 'mysql'],
-        ],
-        'database' => [
-            'type' => 'database',
-            'dsns' => $fallbackForDB,
-            'multiple' => true,
-            'schemes' => ['mariadb', 'mysql'],
-        ],
-        'logs' => [
-            'type' => 'database',
-            'dsns' => System::getEnv('_APP_CONNECTIONS_DB_LOGS', $fallbackForDB),
-            'multiple' => false,
-            'schemes' => ['mariadb', 'mysql'],
-        ],
-        'publisher' => [
-            'type' => 'publisher',
-            'dsns' => $fallbackForRedis,
-            'multiple' => false,
-            'schemes' => ['redis'],
-        ],
-        'consumer' => [
-            'type' => 'consumer',
-            'dsns' => $fallbackForRedis,
-            'multiple' => false,
-            'schemes' => ['redis'],
-        ],
-        'pubsub' => [
-            'type' => 'pubsub',
-            'dsns' => $fallbackForRedis,
-            'multiple' => false,
-            'schemes' => ['redis'],
-        ],
-        'cache' => [
-            'type' => 'cache',
-            'dsns' => $fallbackForRedis,
-            'multiple' => true,
-            'schemes' => ['redis'],
-        ],
-    ];
-
-    $maxConnections = System::getEnv('_APP_CONNECTIONS_MAX', 151);
-    $instanceConnections = $maxConnections / System::getEnv('_APP_POOL_CLIENTS', 14);
-
-    $multiprocessing = System::getEnv('_APP_SERVER_MULTIPROCESS', 'disabled') === 'enabled';
-
-    if ($multiprocessing) {
-        $workerCount = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
-    } else {
-        $workerCount = 1;
-    }
-
-    if ($workerCount > $instanceConnections) {
-        throw new \Exception('Pool size is too small. Increase the number of allowed database connections or decrease the number of workers.', 500);
-    }
-
-    $poolSize = (int)($instanceConnections / $workerCount);
-
-    foreach ($connections as $key => $connection) {
-        $type = $connection['type'] ?? '';
-        $multiple = $connection['multiple'] ?? false;
-        $schemes = $connection['schemes'] ?? [];
-        $config = [];
-        $dsns = explode(',', $connection['dsns'] ?? '');
-        foreach ($dsns as &$dsn) {
-            $dsn = explode('=', $dsn);
-            $name = ($multiple) ? $key . '_' . $dsn[0] : $key;
-            $dsn = $dsn[1] ?? '';
-            $config[] = $name;
-            if (empty($dsn)) {
-                //throw new Exception(Exception::GENERAL_SERVER_ERROR, "Missing value for DSN connection in {$key}");
-                continue;
-            }
-
-            $dsn = new DSN($dsn);
-            $dsnHost = $dsn->getHost();
-            $dsnPort = $dsn->getPort();
-            $dsnUser = $dsn->getUser();
-            $dsnPass = $dsn->getPassword();
-            $dsnScheme = $dsn->getScheme();
-            $dsnDatabase = $dsn->getPath();
-
-            if (!in_array($dsnScheme, $schemes)) {
-                throw new Exception(Exception::GENERAL_SERVER_ERROR, "Invalid console database scheme");
-            }
-
-            /**
-             * Get Resource
-             *
-             * Creation could be reused across connection types like database, cache, queue, etc.
-             *
-             * Resource assignment to an adapter will happen below.
-             */
-            $resource = match ($dsnScheme) {
-                'mysql',
-                'mariadb' => function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) {
-                    return new PDOProxy(function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) {
-                        return new PDO("mysql:host={$dsnHost};port={$dsnPort};dbname={$dsnDatabase};charset=utf8mb4", $dsnUser, $dsnPass, array(
-                            PDO::ATTR_TIMEOUT => 3, // Seconds
-                            PDO::ATTR_PERSISTENT => false,
-                            PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
-                            PDO::ATTR_EMULATE_PREPARES => true,
-                            PDO::ATTR_STRINGIFY_FETCHES => true
-                        ));
-                    });
-                },
-                'redis' => function () use ($dsnHost, $dsnPort, $dsnPass) {
-                    $redis = new \Redis();
-                    @$redis->pconnect($dsnHost, (int)$dsnPort);
-                    if ($dsnPass) {
-                        $redis->auth($dsnPass);
-                    }
-                    $redis->setOption(\Redis::OPT_READ_TIMEOUT, -1);
-
-                    return $redis;
-                },
-                default => throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Invalid scheme'),
-            };
-
-            $pool = new Pool($name, $poolSize, function () use ($type, $resource, $dsn) {
-                // Get Adapter
-                switch ($type) {
-                    case 'database':
-                        $adapter = match ($dsn->getScheme()) {
-                            'mariadb' => new MariaDB($resource()),
-                            'mysql' => new MySQL($resource()),
-                            default => null
-                        };
-
-                        $adapter->setDatabase($dsn->getPath());
-                        return $adapter;
-                    case 'pubsub':
-                        return match ($dsn->getScheme()) {
-                            'redis' => new PubSub($resource()),
-                            default => null
-                        };
-                    case 'publisher':
-                    case 'consumer':
-                        return match ($dsn->getScheme()) {
-                            'redis' => new Queue\Broker\Redis(new Queue\Connection\Redis($dsn->getHost(), $dsn->getPort())),
-                            default => null
-                        };
-                    case 'cache':
-                        return match ($dsn->getScheme()) {
-                            'redis' => new RedisCache($resource()),
-                            default => null
-                        };
-                    default:
-                        throw new Exception(Exception::GENERAL_SERVER_ERROR, "Server error: Missing adapter implementation.");
-                }
-            });
-
-            $group->add($pool);
-        }
-
-        Config::setParam('pools-' . $key, $config);
-    }
-
-    return $group;
-});
-
-$register->set('db', function () {
-    // This is usually for our workers or CLI commands scope
-    $dbHost = System::getEnv('_APP_DB_HOST', '');
-    $dbPort = System::getEnv('_APP_DB_PORT', '');
-    $dbUser = System::getEnv('_APP_DB_USER', '');
-    $dbPass = System::getEnv('_APP_DB_PASS', '');
-    $dbScheme = System::getEnv('_APP_DB_SCHEMA', '');
-
-    return new PDO(
-        "mysql:host={$dbHost};port={$dbPort};dbname={$dbScheme};charset=utf8mb4",
-        $dbUser,
-        $dbPass,
-        SQL::getPDOAttributes()
-    );
-});
-
-$register->set('smtp', function () {
-    $mail = new PHPMailer(true);
-
-    $mail->isSMTP();
-
-    $username = System::getEnv('_APP_SMTP_USERNAME');
-    $password = System::getEnv('_APP_SMTP_PASSWORD');
-
-    $mail->XMailer = 'Appwrite Mailer';
-    $mail->Host = System::getEnv('_APP_SMTP_HOST', 'smtp');
-    $mail->Port = System::getEnv('_APP_SMTP_PORT', 25);
-    $mail->SMTPAuth = !empty($username) && !empty($password);
-    $mail->Username = $username;
-    $mail->Password = $password;
-    $mail->SMTPSecure = System::getEnv('_APP_SMTP_SECURE', '');
-    $mail->SMTPAutoTLS = false;
-    $mail->CharSet = 'UTF-8';
-
-    $from = \urldecode(System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'));
-    $email = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
-
-    $mail->setFrom($email, $from);
-    $mail->addReplyTo($email, $from);
-
-    $mail->isHTML(true);
-
-    return $mail;
-});
-$register->set('geodb', function () {
-    return new Reader(__DIR__ . '/../assets/dbip/dbip-country-lite-2024-09.mmdb');
-});
-$register->set('passwordsDictionary', function () {
-    $content = \file_get_contents(__DIR__ . '/../assets/security/10k-common-passwords');
-    $content = explode("\n", $content);
-    $content = array_flip($content);
-    return $content;
-});
-$register->set('promiseAdapter', function () {
-    return new Swoole();
-});
-$register->set('hooks', function () {
-    return new Hooks();
-});
@@ -1,824 +0,0 @@
-<?php
-
-use Ahc\Jwt\JWT;
-use Ahc\Jwt\JWTException;
-use Appwrite\Auth\Auth;
-use Appwrite\Auth\Key;
-use Appwrite\Event\Audit;
-use Appwrite\Event\Build;
-use Appwrite\Event\Certificate;
-use Appwrite\Event\Database as EventDatabase;
-use Appwrite\Event\Delete;
-use Appwrite\Event\Event;
-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\Webhook;
-use Appwrite\Extend\Exception;
-use Appwrite\GraphQL\Schema;
-use Appwrite\Network\Validator\Origin;
-use Appwrite\Utopia\Request;
-use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
-use Utopia\App;
-use Utopia\Cache\Adapter\Sharding;
-use Utopia\Cache\Cache;
-use Utopia\CLI\Console;
-use Utopia\Config\Config;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
-use Utopia\Database\Helpers\ID;
-use Utopia\Database\Query;
-use Utopia\Database\Validator\Authorization;
-use Utopia\DSN\DSN;
-use Utopia\Locale\Locale;
-use Utopia\Logger\Log;
-use Utopia\Pools\Group;
-use Utopia\Queue\Publisher;
-use Utopia\Storage\Device;
-use Utopia\Storage\Device\Backblaze;
-use Utopia\Storage\Device\DOSpaces;
-use Utopia\Storage\Device\Linode;
-use Utopia\Storage\Device\Local;
-use Utopia\Storage\Device\S3;
-use Utopia\Storage\Device\Wasabi;
-use Utopia\Storage\Storage;
-use Utopia\System\System;
-use Utopia\Validator\Hostname;
-use Utopia\VCS\Adapter\Git\GitHub as VcsGitHub;
-
-// Runtime Execution
-App::setResource('log', fn () => new Log());
-App::setResource('logger', function ($register) {
-    return $register->get('logger');
-}, ['register']);
-
-App::setResource('hooks', function ($register) {
-    return $register->get('hooks');
-}, ['register']);
-
-App::setResource('register', fn () => $register);
-App::setResource('locale', fn () => new Locale(System::getEnv('_APP_LOCALE', 'en')));
-
-App::setResource('localeCodes', function () {
-    return array_map(fn ($locale) => $locale['code'], Config::getParam('locale-codes', []));
-});
-
-// Queues
-App::setResource('publisher', function (Group $pools) {
-    return $pools->get('publisher')->pop()->getResource();
-}, ['pools']);
-App::setResource('consumer', function (Group $pools) {
-    return $pools->get('consumer')->pop()->getResource();
-}, ['pools']);
-App::setResource('queueForMessaging', function (Publisher $publisher) {
-    return new Messaging($publisher);
-}, ['publisher']);
-App::setResource('queueForMails', function (Publisher $publisher) {
-    return new Mail($publisher);
-}, ['publisher']);
-App::setResource('queueForBuilds', function (Publisher $publisher) {
-    return new Build($publisher);
-}, ['publisher']);
-App::setResource('queueForDatabase', function (Publisher $publisher) {
-    return new EventDatabase($publisher);
-}, ['publisher']);
-App::setResource('queueForDeletes', function (Publisher $publisher) {
-    return new Delete($publisher);
-}, ['publisher']);
-App::setResource('queueForEvents', function (Publisher $publisher) {
-    return new Event($publisher);
-}, ['publisher']);
-App::setResource('queueForWebhooks', function (Publisher $publisher) {
-    return new Webhook($publisher);
-}, ['publisher']);
-App::setResource('queueForRealtime', function () {
-    return new Realtime();
-}, []);
-App::setResource('queueForStatsUsage', function (Publisher $publisher) {
-    return new StatsUsage($publisher);
-}, ['publisher']);
-App::setResource('queueForAudits', function (Publisher $publisher) {
-    return new Audit($publisher);
-}, ['publisher']);
-App::setResource('queueForFunctions', function (Publisher $publisher) {
-    return new Func($publisher);
-}, ['publisher']);
-App::setResource('queueForCertificates', function (Publisher $publisher) {
-    return new Certificate($publisher);
-}, ['publisher']);
-App::setResource('queueForMigrations', function (Publisher $publisher) {
-    return new Migration($publisher);
-}, ['publisher']);
-App::setResource('clients', function ($request, $console, $project) {
-    $console->setAttribute('platforms', [ // Always allow current host
-        '$collection' => ID::custom('platforms'),
-        'name' => 'Current Host',
-        'type' => Origin::CLIENT_TYPE_WEB,
-        'hostname' => $request->getHostname(),
-    ], Document::SET_TYPE_APPEND);
-
-    $hostnames = explode(',', System::getEnv('_APP_CONSOLE_HOSTNAMES', ''));
-    $validator = new Hostname();
-    foreach ($hostnames as $hostname) {
-        $hostname = trim($hostname);
-        if (!$validator->isValid($hostname)) {
-            continue;
-        }
-        $console->setAttribute('platforms', [
-            '$collection' => ID::custom('platforms'),
-            'type' => Origin::CLIENT_TYPE_WEB,
-            'name' => $hostname,
-            'hostname' => $hostname,
-        ], Document::SET_TYPE_APPEND);
-    }
-
-    /**
-     * Get All verified client URLs for both console and current projects
-     * + Filter for duplicated entries
-     */
-    $clientsConsole = \array_map(
-        fn ($node) => $node['hostname'],
-        \array_filter(
-            $console->getAttribute('platforms', []),
-            fn ($node) => (isset($node['type']) && ($node['type'] === Origin::CLIENT_TYPE_WEB) && !empty($node['hostname']))
-        )
-    );
-
-    $clients = $clientsConsole;
-    $platforms = $project->getAttribute('platforms', []);
-
-    foreach ($platforms as $node) {
-        if (
-            isset($node['type']) &&
-            ($node['type'] === Origin::CLIENT_TYPE_WEB ||
-            $node['type'] === Origin::CLIENT_TYPE_FLUTTER_WEB) &&
-            !empty($node['hostname'])
-        ) {
-            $clients[] = $node['hostname'];
-        }
-    }
-
-    return \array_unique($clients);
-}, ['request', 'console', 'project']);
-
-App::setResource('user', function ($mode, $project, $console, $request, $response, $dbForProject, $dbForPlatform) {
-    /** @var Appwrite\Utopia\Request $request */
-    /** @var Appwrite\Utopia\Response $response */
-    /** @var Utopia\Database\Document $project */
-    /** @var Utopia\Database\Database $dbForProject */
-    /** @var Utopia\Database\Database $dbForPlatform */
-    /** @var string $mode */
-
-    Authorization::setDefaultStatus(true);
-
-    Auth::setCookieName('a_session_' . $project->getId());
-
-    if (APP_MODE_ADMIN === $mode) {
-        Auth::setCookieName('a_session_' . $console->getId());
-    }
-
-    $session = Auth::decodeSession(
-        $request->getCookie(
-            Auth::$cookieName, // Get sessions
-            $request->getCookie(Auth::$cookieName . '_legacy', '')
-        )
-    );
-
-    // Get session from header for SSR clients
-    if (empty($session['id']) && empty($session['secret'])) {
-        $sessionHeader = $request->getHeader('x-appwrite-session', '');
-
-        if (!empty($sessionHeader)) {
-            $session = Auth::decodeSession($sessionHeader);
-        }
-    }
-
-    // Get fallback session from old clients (no SameSite support) or clients who block 3rd-party cookies
-    if ($response) {
-        $response->addHeader('X-Debug-Fallback', 'false');
-    }
-
-    if (empty($session['id']) && empty($session['secret'])) {
-        if ($response) {
-            $response->addHeader('X-Debug-Fallback', 'true');
-        }
-        $fallback = $request->getHeader('x-fallback-cookies', '');
-        $fallback = \json_decode($fallback, true);
-        $session = Auth::decodeSession(((isset($fallback[Auth::$cookieName])) ? $fallback[Auth::$cookieName] : ''));
-    }
-
-    Auth::$unique = $session['id'] ?? '';
-    Auth::$secret = $session['secret'] ?? '';
-
-    if (APP_MODE_ADMIN !== $mode) {
-        if ($project->isEmpty()) {
-            $user = new Document([]);
-        } else {
-            if ($project->getId() === 'console') {
-                $user = $dbForPlatform->getDocument('users', Auth::$unique);
-            } else {
-                $user = $dbForProject->getDocument('users', Auth::$unique);
-            }
-        }
-    } else {
-        $user = $dbForPlatform->getDocument('users', Auth::$unique);
-    }
-
-    if (
-        $user->isEmpty() // Check a document has been found in the DB
-        || !Auth::sessionVerify($user->getAttribute('sessions', []), Auth::$secret)
-    ) { // Validate user has valid login token
-        $user = new Document([]);
-    }
-
-    // if (APP_MODE_ADMIN === $mode) {
-    //     if ($user->find('teamInternalId', $project->getAttribute('teamInternalId'), 'memberships')) {
-    //         Authorization::setDefaultStatus(false);  // Cancel security segmentation for admin users.
-    //     } else {
-    //         $user = new Document([]);
-    //     }
-    // }
-
-    $authJWT = $request->getHeader('x-appwrite-jwt', '');
-
-    if (!empty($authJWT) && !$project->isEmpty()) { // JWT authentication
-        $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 3600, 0);
-
-        try {
-            $payload = $jwt->decode($authJWT);
-        } catch (JWTException $error) {
-            throw new Exception(Exception::USER_JWT_INVALID, 'Failed to verify JWT. ' . $error->getMessage());
-        }
-
-        $jwtUserId = $payload['userId'] ?? '';
-        if (!empty($jwtUserId)) {
-            $user = $dbForProject->getDocument('users', $jwtUserId);
-        }
-
-        $jwtSessionId = $payload['sessionId'] ?? '';
-        if (!empty($jwtSessionId)) {
-            if (empty($user->find('$id', $jwtSessionId, 'sessions'))) { // Match JWT to active token
-                $user = new Document([]);
-            }
-        }
-    }
-
-    $dbForProject->setMetadata('user', $user->getId());
-    $dbForPlatform->setMetadata('user', $user->getId());
-
-    return $user;
-}, ['mode', 'project', 'console', 'request', 'response', 'dbForProject', 'dbForPlatform']);
-
-App::setResource('project', function ($dbForPlatform, $request, $console) {
-    /** @var Appwrite\Utopia\Request $request */
-    /** @var Utopia\Database\Database $dbForPlatform */
-    /** @var Utopia\Database\Document $console */
-
-    $projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', ''));
-
-    if (empty($projectId) || $projectId === 'console') {
-        return $console;
-    }
-
-    $project = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
-
-    return $project;
-}, ['dbForPlatform', 'request', 'console']);
-
-App::setResource('session', function (Document $user) {
-    if ($user->isEmpty()) {
-        return;
-    }
-
-    $sessions = $user->getAttribute('sessions', []);
-    $sessionId = Auth::sessionVerify($user->getAttribute('sessions'), Auth::$secret);
-
-    if (!$sessionId) {
-        return;
-    }
-
-    foreach ($sessions as $session) {/** @var Document $session */
-        if ($sessionId === $session->getId()) {
-            return $session;
-        }
-    }
-
-    return;
-}, ['user']);
-
-App::setResource('console', function () {
-    return new Document(Config::getParam('console'));
-}, []);
-
-App::setResource('dbForProject', function (Group $pools, Database $dbForPlatform, Cache $cache, Document $project) {
-    if ($project->isEmpty() || $project->getId() === 'console') {
-        return $dbForPlatform;
-    }
-
-    try {
-        $dsn = new DSN($project->getAttribute('database'));
-    } catch (\InvalidArgumentException) {
-        // TODO: Temporary until all projects are using shared tables
-        $dsn = new DSN('mysql://' . $project->getAttribute('database'));
-    }
-
-    $dbAdapter = $pools
-        ->get($dsn->getHost())
-        ->pop()
-        ->getResource();
-
-    $database = new Database($dbAdapter, $cache);
-
-    $database
-        ->setMetadata('host', \gethostname())
-        ->setMetadata('project', $project->getId())
-        ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
-        ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
-
-    $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-
-    if (\in_array($dsn->getHost(), $sharedTables)) {
-        $database
-            ->setSharedTables(true)
-            ->setTenant($project->getInternalId())
-            ->setNamespace($dsn->getParam('namespace'));
-    } else {
-        $database
-            ->setSharedTables(false)
-            ->setTenant(null)
-            ->setNamespace('_' . $project->getInternalId());
-    }
-
-    return $database;
-}, ['pools', 'dbForPlatform', 'cache', 'project']);
-
-App::setResource('dbForPlatform', function (Group $pools, Cache $cache) {
-    $dbAdapter = $pools
-        ->get('console')
-        ->pop()
-        ->getResource();
-
-    $database = new Database($dbAdapter, $cache);
-
-    $database
-        ->setNamespace('_console')
-        ->setMetadata('host', \gethostname())
-        ->setMetadata('project', 'console')
-        ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
-        ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
-
-    return $database;
-}, ['pools', 'cache']);
-
-App::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache) {
-    $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
-
-    return function (Document $project) use ($pools, $dbForPlatform, $cache, &$databases) {
-        if ($project->isEmpty() || $project->getId() === 'console') {
-            return $dbForPlatform;
-        }
-
-        try {
-            $dsn = new DSN($project->getAttribute('database'));
-        } catch (\InvalidArgumentException) {
-            // TODO: Temporary until all projects are using shared tables
-            $dsn = new DSN('mysql://' . $project->getAttribute('database'));
-        }
-
-        $configure = (function (Database $database) use ($project, $dsn) {
-            $database
-                ->setMetadata('host', \gethostname())
-                ->setMetadata('project', $project->getId())
-                ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
-                ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
-
-            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-
-            if (\in_array($dsn->getHost(), $sharedTables)) {
-                $database
-                    ->setSharedTables(true)
-                    ->setTenant($project->getInternalId())
-                    ->setNamespace($dsn->getParam('namespace'));
-            } else {
-                $database
-                    ->setSharedTables(false)
-                    ->setTenant(null)
-                    ->setNamespace('_' . $project->getInternalId());
-            }
-        });
-
-        if (isset($databases[$dsn->getHost()])) {
-            $database = $databases[$dsn->getHost()];
-            $configure($database);
-            return $database;
-        }
-
-        $dbAdapter = $pools
-            ->get($dsn->getHost())
-            ->pop()
-            ->getResource();
-
-        $database = new Database($dbAdapter, $cache);
-        $databases[$dsn->getHost()] = $database;
-        $configure($database);
-
-        return $database;
-    };
-}, ['pools', 'dbForPlatform', 'cache']);
-
-App::setResource('getLogsDB', function (Group $pools, Cache $cache) {
-    $database = null;
-    return function (?Document $project = null) use ($pools, $cache, $database) {
-        if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getInternalId());
-            return $database;
-        }
-
-        $dbAdapter = $pools
-            ->get('logs')
-            ->pop()
-            ->getResource();
-
-        $database = new Database(
-            $dbAdapter,
-            $cache
-        );
-
-        $database
-            ->setSharedTables(true)
-            ->setNamespace('logsV1')
-            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
-            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
-
-        // set tenant
-        if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getInternalId());
-        }
-
-        return $database;
-    };
-}, ['pools', 'cache']);
-
-App::setResource('cache', function (Group $pools) {
-    $list = Config::getParam('pools-cache', []);
-    $adapters = [];
-
-    foreach ($list as $value) {
-        $adapters[] = $pools
-            ->get($value)
-            ->pop()
-            ->getResource()
-        ;
-    }
-
-    return new Cache(new Sharding($adapters));
-}, ['pools']);
-
-App::setResource('redis', function () {
-    $host = System::getEnv('_APP_REDIS_HOST', 'localhost');
-    $port = System::getEnv('_APP_REDIS_PORT', 6379);
-    $pass = System::getEnv('_APP_REDIS_PASS', '');
-
-    $redis = new \Redis();
-    @$redis->pconnect($host, (int)$port);
-    if ($pass) {
-        $redis->auth($pass);
-    }
-    $redis->setOption(\Redis::OPT_READ_TIMEOUT, -1);
-
-    return $redis;
-});
-
-App::setResource('timelimit', function (\Redis $redis) {
-    return function (string $key, int $limit, int $time) use ($redis) {
-        return new TimeLimitRedis($key, $limit, $time, $redis);
-    };
-}, ['redis']);
-
-App::setResource('deviceForLocal', function () {
-    return new Local();
-});
-
-App::setResource('deviceForFiles', function ($project) {
-    return getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId());
-}, ['project']);
-
-App::setResource('deviceForFunctions', function ($project) {
-    return getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId());
-}, ['project']);
-
-App::setResource('deviceForBuilds', function ($project) {
-    return getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId());
-}, ['project']);
-
-function getDevice(string $root, string $connection = ''): Device
-{
-    $connection = !empty($connection) ? $connection : System::getEnv('_APP_CONNECTIONS_STORAGE', '');
-
-    if (!empty($connection)) {
-        $acl = 'private';
-        $device = Storage::DEVICE_LOCAL;
-        $accessKey = '';
-        $accessSecret = '';
-        $bucket = '';
-        $region = '';
-        $url = System::getEnv('_APP_STORAGE_S3_ENDPOINT', '');
-
-        try {
-            $dsn = new DSN($connection);
-            $device = $dsn->getScheme();
-            $accessKey = $dsn->getUser() ?? '';
-            $accessSecret = $dsn->getPassword() ?? '';
-            $bucket = $dsn->getPath() ?? '';
-            $region = $dsn->getParam('region');
-        } catch (\Throwable $e) {
-            Console::warning($e->getMessage() . 'Invalid DSN. Defaulting to Local device.');
-        }
-
-        switch ($device) {
-            case Storage::DEVICE_S3:
-                return new S3($root, $accessKey, $accessSecret, $bucket, $region, $acl, $url);
-            case STORAGE::DEVICE_DO_SPACES:
-                $device = new DOSpaces($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-                $device->setHttpVersion(S3::HTTP_VERSION_1_1);
-                return $device;
-            case Storage::DEVICE_BACKBLAZE:
-                return new Backblaze($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-            case Storage::DEVICE_LINODE:
-                return new Linode($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-            case Storage::DEVICE_WASABI:
-                return new Wasabi($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-            case Storage::DEVICE_LOCAL:
-            default:
-                return new Local($root);
-        }
-    } else {
-        switch (strtolower(System::getEnv('_APP_STORAGE_DEVICE', Storage::DEVICE_LOCAL) ?? '')) {
-            case Storage::DEVICE_LOCAL:
-            default:
-                return new Local($root);
-            case Storage::DEVICE_S3:
-                $s3AccessKey = System::getEnv('_APP_STORAGE_S3_ACCESS_KEY', '');
-                $s3SecretKey = System::getEnv('_APP_STORAGE_S3_SECRET', '');
-                $s3Region = System::getEnv('_APP_STORAGE_S3_REGION', '');
-                $s3Bucket = System::getEnv('_APP_STORAGE_S3_BUCKET', '');
-                $s3Acl = 'private';
-                $s3EndpointUrl = System::getEnv('_APP_STORAGE_S3_ENDPOINT', '');
-                return new S3($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl, $s3EndpointUrl);
-            case Storage::DEVICE_DO_SPACES:
-                $doSpacesAccessKey = System::getEnv('_APP_STORAGE_DO_SPACES_ACCESS_KEY', '');
-                $doSpacesSecretKey = System::getEnv('_APP_STORAGE_DO_SPACES_SECRET', '');
-                $doSpacesRegion = System::getEnv('_APP_STORAGE_DO_SPACES_REGION', '');
-                $doSpacesBucket = System::getEnv('_APP_STORAGE_DO_SPACES_BUCKET', '');
-                $doSpacesAcl = 'private';
-                $device = new DOSpaces($root, $doSpacesAccessKey, $doSpacesSecretKey, $doSpacesBucket, $doSpacesRegion, $doSpacesAcl);
-                $device->setHttpVersion(S3::HTTP_VERSION_1_1);
-                return $device;
-            case Storage::DEVICE_BACKBLAZE:
-                $backblazeAccessKey = System::getEnv('_APP_STORAGE_BACKBLAZE_ACCESS_KEY', '');
-                $backblazeSecretKey = System::getEnv('_APP_STORAGE_BACKBLAZE_SECRET', '');
-                $backblazeRegion = System::getEnv('_APP_STORAGE_BACKBLAZE_REGION', '');
-                $backblazeBucket = System::getEnv('_APP_STORAGE_BACKBLAZE_BUCKET', '');
-                $backblazeAcl = 'private';
-                return new Backblaze($root, $backblazeAccessKey, $backblazeSecretKey, $backblazeBucket, $backblazeRegion, $backblazeAcl);
-            case Storage::DEVICE_LINODE:
-                $linodeAccessKey = System::getEnv('_APP_STORAGE_LINODE_ACCESS_KEY', '');
-                $linodeSecretKey = System::getEnv('_APP_STORAGE_LINODE_SECRET', '');
-                $linodeRegion = System::getEnv('_APP_STORAGE_LINODE_REGION', '');
-                $linodeBucket = System::getEnv('_APP_STORAGE_LINODE_BUCKET', '');
-                $linodeAcl = 'private';
-                return new Linode($root, $linodeAccessKey, $linodeSecretKey, $linodeBucket, $linodeRegion, $linodeAcl);
-            case Storage::DEVICE_WASABI:
-                $wasabiAccessKey = System::getEnv('_APP_STORAGE_WASABI_ACCESS_KEY', '');
-                $wasabiSecretKey = System::getEnv('_APP_STORAGE_WASABI_SECRET', '');
-                $wasabiRegion = System::getEnv('_APP_STORAGE_WASABI_REGION', '');
-                $wasabiBucket = System::getEnv('_APP_STORAGE_WASABI_BUCKET', '');
-                $wasabiAcl = 'private';
-                return new Wasabi($root, $wasabiAccessKey, $wasabiSecretKey, $wasabiBucket, $wasabiRegion, $wasabiAcl);
-        }
-    }
-}
-
-App::setResource('mode', function ($request) {
-    /** @var Appwrite\Utopia\Request $request */
-
-    /**
-     * Defines the mode for the request:
-     * - 'default' => Requests for Client and Server Side
-     * - 'admin' => Request from the Console on non-console projects
-     */
-    return $request->getParam('mode', $request->getHeader('x-appwrite-mode', APP_MODE_DEFAULT));
-}, ['request']);
-
-App::setResource('geodb', function ($register) {
-    /** @var Utopia\Registry\Registry $register */
-    return $register->get('geodb');
-}, ['register']);
-
-App::setResource('passwordsDictionary', function ($register) {
-    /** @var Utopia\Registry\Registry $register */
-    return $register->get('passwordsDictionary');
-}, ['register']);
-
-
-App::setResource('servers', function () {
-    $platforms = Config::getParam('platforms');
-    $server = $platforms[APP_PLATFORM_SERVER];
-
-    $languages = array_map(function ($language) {
-        return strtolower($language['name']);
-    }, $server['sdks']);
-
-    return $languages;
-});
-
-App::setResource('promiseAdapter', function ($register) {
-    return $register->get('promiseAdapter');
-}, ['register']);
-
-App::setResource('schema', function ($utopia, $dbForProject) {
-
-    $complexity = function (int $complexity, array $args) {
-        $queries = Query::parseQueries($args['queries'] ?? []);
-        $query = Query::getByType($queries, [Query::TYPE_LIMIT])[0] ?? null;
-        $limit = $query ? $query->getValue() : APP_LIMIT_LIST_DEFAULT;
-
-        return $complexity * $limit;
-    };
-
-    $attributes = function (int $limit, int $offset) use ($dbForProject) {
-        $attrs = Authorization::skip(fn () => $dbForProject->find('attributes', [
-            Query::limit($limit),
-            Query::offset($offset),
-        ]));
-
-        return \array_map(function ($attr) {
-            return $attr->getArrayCopy();
-        }, $attrs);
-    };
-
-    $urls = [
-        'list' => function (string $databaseId, string $collectionId, array $args) {
-            return "/v1/databases/$databaseId/collections/$collectionId/documents";
-        },
-        'create' => function (string $databaseId, string $collectionId, array $args) {
-            return "/v1/databases/$databaseId/collections/$collectionId/documents";
-        },
-        'read' => function (string $databaseId, string $collectionId, array $args) {
-            return "/v1/databases/$databaseId/collections/$collectionId/documents/{$args['documentId']}";
-        },
-        'update' => function (string $databaseId, string $collectionId, array $args) {
-            return "/v1/databases/$databaseId/collections/$collectionId/documents/{$args['documentId']}";
-        },
-        'delete' => function (string $databaseId, string $collectionId, array $args) {
-            return "/v1/databases/$databaseId/collections/$collectionId/documents/{$args['documentId']}";
-        },
-    ];
-
-    $params = [
-        'list' => function (string $databaseId, string $collectionId, array $args) {
-            return [ 'queries' => $args['queries']];
-        },
-        'create' => function (string $databaseId, string $collectionId, array $args) {
-            $id = $args['id'] ?? 'unique()';
-            $permissions = $args['permissions'] ?? null;
-
-            unset($args['id']);
-            unset($args['permissions']);
-
-            // Order must be the same as the route params
-            return [
-                'databaseId' => $databaseId,
-                'documentId' => $id,
-                'collectionId' => $collectionId,
-                'data' => $args,
-                'permissions' => $permissions,
-            ];
-        },
-        'update' => function (string $databaseId, string $collectionId, array $args) {
-            $documentId = $args['id'];
-            $permissions = $args['permissions'] ?? null;
-
-            unset($args['id']);
-            unset($args['permissions']);
-
-            // Order must be the same as the route params
-            return [
-                'databaseId' => $databaseId,
-                'collectionId' => $collectionId,
-                'documentId' => $documentId,
-                'data' => $args,
-                'permissions' => $permissions,
-            ];
-        },
-    ];
-
-    return Schema::build(
-        $utopia,
-        $complexity,
-        $attributes,
-        $urls,
-        $params,
-    );
-}, ['utopia', 'dbForProject']);
-
-App::setResource('contributors', function () {
-    $path = 'app/config/contributors.json';
-    $list = (file_exists($path)) ? json_decode(file_get_contents($path), true) : [];
-    return $list;
-});
-
-App::setResource('employees', function () {
-    $path = 'app/config/employees.json';
-    $list = (file_exists($path)) ? json_decode(file_get_contents($path), true) : [];
-    return $list;
-});
-
-App::setResource('heroes', function () {
-    $path = 'app/config/heroes.json';
-    $list = (file_exists($path)) ? json_decode(file_get_contents($path), true) : [];
-    return $list;
-});
-
-App::setResource('gitHub', function (Cache $cache) {
-    return new VcsGitHub($cache);
-}, ['cache']);
-
-App::setResource('requestTimestamp', function ($request) {
-    //TODO: Move this to the Request class itself
-    $timestampHeader = $request->getHeader('x-appwrite-timestamp');
-    $requestTimestamp = null;
-    if (!empty($timestampHeader)) {
-        try {
-            $requestTimestamp = new \DateTime($timestampHeader);
-        } catch (\Throwable $e) {
-            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Invalid X-Appwrite-Timestamp header value');
-        }
-    }
-    return $requestTimestamp;
-}, ['request']);
-
-App::setResource('plan', function (array $plan = []) {
-    return [];
-});
-
-App::setResource('smsRates', function () {
-    return [];
-});
-
-App::setResource('team', function (Document $project, Database $dbForPlatform, App $utopia, Request $request) {
-    $teamInternalId = '';
-    if ($project->getId() !== 'console') {
-        $teamInternalId = $project->getAttribute('teamInternalId', '');
-    } else {
-        $route = $utopia->match($request);
-        $path = $route->getPath();
-        if (str_starts_with($path, '/v1/projects/:projectId')) {
-            $uri = $request->getURI();
-            $pid = explode('/', $uri)[3];
-            $p = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $pid));
-            $teamInternalId = $p->getAttribute('teamInternalId', '');
-        } elseif ($path === '/v1/projects') {
-            $teamId = $request->getParam('teamId', '');
-            $team = Authorization::skip(fn () => $dbForPlatform->getDocument('teams', $teamId));
-            return $team;
-        }
-    }
-
-    $team = Authorization::skip(function () use ($dbForPlatform, $teamInternalId) {
-        return $dbForPlatform->findOne('teams', [
-            Query::equal('$internalId', [$teamInternalId]),
-        ]);
-    });
-
-    return $team;
-}, ['project', 'dbForPlatform', 'utopia', 'request']);
-
-App::setResource(
-    'isResourceBlocked',
-    fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false
-);
-
-App::setResource('previewHostname', function (Request $request) {
-    if (App::isDevelopment()) {
-        $host = $request->getQuery('appwrite-hostname') ?? '';
-        if (!empty($host)) {
-            return $host;
-        }
-    }
-
-    return '';
-}, ['request']);
-
-App::setResource('apiKey', function (Request $request, Document $project): ?Key {
-    $key = $request->getHeader('x-appwrite-key');
-
-    if (empty($key)) {
-        return null;
-    }
-
-    return Key::decode($project, $key);
-}, ['request', 'project']);
@@ -86,7 +86,7 @@ $image = $this->getParam('image', '');
      - _APP_OPTIONS_ABUSE
      - _APP_OPTIONS_ROUTER_PROTECTION
      - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
+      - _APP_OPTIONS_COMPUTE_FORCE_HTTPS
      - _APP_OPENSSL_KEY_V1
      - _APP_DOMAIN
      - _APP_DOMAIN_TARGET
@@ -116,7 +116,6 @@ $image = $this->getParam('image', '');
      - _APP_STORAGE_S3_SECRET
      - _APP_STORAGE_S3_REGION
      - _APP_STORAGE_S3_BUCKET
-      - _APP_STORAGE_S3_ENDPOINT
      - _APP_STORAGE_DO_SPACES_ACCESS_KEY
      - _APP_STORAGE_DO_SPACES_SECRET
      - _APP_STORAGE_DO_SPACES_REGION
@@ -133,12 +132,14 @@ $image = $this->getParam('image', '');
      - _APP_STORAGE_WASABI_SECRET
      - _APP_STORAGE_WASABI_REGION
      - _APP_STORAGE_WASABI_BUCKET
-      - _APP_FUNCTIONS_SIZE_LIMIT
-      - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
+      - _APP_COMPUTE_SIZE_LIMIT
+      - _APP_COMPUTE_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
      - _APP_FUNCTIONS_RUNTIMES
+      - _APP_SITES_FRAMEWORKS
+      - _APP_SITES_RUNTIMES
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
      - _APP_LOGGING_CONFIG
@@ -148,7 +149,6 @@ $image = $this->getParam('image', '');
      - _APP_MAINTENANCE_RETENTION_CACHE
      - _APP_MAINTENANCE_RETENTION_ABUSE
      - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
      - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
      - _APP_MAINTENANCE_RETENTION_SCHEDULES
      - _APP_SMS_PROVIDER
@@ -165,10 +165,11 @@ $image = $this->getParam('image', '');
      - _APP_MIGRATIONS_FIREBASE_CLIENT_ID
      - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
      - _APP_ASSISTANT_OPENAI_API_KEY
+
  appwrite-console:
    <<: *x-logging
    container_name: appwrite-console
-    image: <?php echo $organization; ?>/console:5.2.53
+    image: <?php echo $organization; ?>/console:5.2.27
    restart: unless-stopped
    networks:
      - appwrite
@@ -319,7 +320,6 @@ $image = $this->getParam('image', '');
      - _APP_STORAGE_S3_SECRET
      - _APP_STORAGE_S3_REGION
      - _APP_STORAGE_S3_BUCKET
-      - _APP_STORAGE_S3_ENDPOINT
      - _APP_STORAGE_DO_SPACES_ACCESS_KEY
      - _APP_STORAGE_DO_SPACES_SECRET
      - _APP_STORAGE_DO_SPACES_REGION
@@ -341,10 +341,7 @@ $image = $this->getParam('image', '');
      - _APP_EXECUTOR_HOST
      - _APP_MAINTENANCE_RETENTION_ABUSE
      - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
      - _APP_MAINTENANCE_RETENTION_EXECUTION
-      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
-      - _APP_EMAIL_CERTIFICATES

  appwrite-worker-databases:
    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
@@ -405,20 +402,19 @@ $image = $this->getParam('image', '');
      - _APP_VCS_GITHUB_APP_NAME
      - _APP_VCS_GITHUB_PRIVATE_KEY
      - _APP_VCS_GITHUB_APP_ID
-      - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
-      - _APP_FUNCTIONS_SIZE_LIMIT
+      - _APP_COMPUTE_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
+      - _APP_COMPUTE_SIZE_LIMIT
      - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
+      - _APP_OPTIONS_COMPUTE_FORCE_HTTPS
      - _APP_DOMAIN
      - _APP_STORAGE_DEVICE
      - _APP_STORAGE_S3_ACCESS_KEY
      - _APP_STORAGE_S3_SECRET
      - _APP_STORAGE_S3_REGION
      - _APP_STORAGE_S3_BUCKET
-      - _APP_STORAGE_S3_ENDPOINT
      - _APP_STORAGE_DO_SPACES_ACCESS_KEY
      - _APP_STORAGE_DO_SPACES_SECRET
      - _APP_STORAGE_DO_SPACES_REGION
@@ -496,10 +492,10 @@ $image = $this->getParam('image', '');
      - _APP_DB_SCHEMA
      - _APP_DB_USER
      - _APP_DB_PASS
-      - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
+      - _APP_COMPUTE_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
      - _APP_USAGE_STATS
@@ -574,7 +570,6 @@ $image = $this->getParam('image', '');
      - _APP_STORAGE_S3_SECRET
      - _APP_STORAGE_S3_REGION
      - _APP_STORAGE_S3_BUCKET
-      - _APP_STORAGE_S3_ENDPOINT
      - _APP_STORAGE_DO_SPACES_ACCESS_KEY
      - _APP_STORAGE_DO_SPACES_SECRET
      - _APP_STORAGE_DO_SPACES_REGION
@@ -653,73 +648,13 @@ $image = $this->getParam('image', '');
      - _APP_MAINTENANCE_RETENTION_CACHE
      - _APP_MAINTENANCE_RETENTION_ABUSE
      - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
      - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
      - _APP_MAINTENANCE_RETENTION_SCHEDULES

-  appwrite-task-stats-resources:
+  appwrite-worker-usage:
    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
-    container_name: appwrite-task-stats-resources
-    entrypoint: stats-resources
-    <<: *x-logging
-    networks:
-      - appwrite
-    volumes:
-      - ./app:/usr/src/code/app
-      - ./src:/usr/src/code/src
-    depends_on:
-      - redis
-      - mariadb
-    environment:
-      - _APP_ENV
-      - _APP_WORKER_PER_CORE
-      - _APP_OPENSSL_KEY_V1
-      - _APP_DB_HOST
-      - _APP_DB_PORT
-      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
-      - _APP_REDIS_HOST
-      - _APP_REDIS_PORT
-      - _APP_REDIS_USER
-      - _APP_REDIS_PASS
-      - _APP_USAGE_STATS
-      - _APP_LOGGING_CONFIG
-      - _APP_DATABASE_SHARED_TABLES
-      - _APP_STATS_RESOURCES_INTERVAL
-
-  appwrite-worker-stats-resources:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
-    entrypoint: worker-stats-resources
-    container_name: appwrite-worker-stats-resources
-    <<: *x-logging
-    restart: unless-stopped
-    networks:
-      - appwrite
-    depends_on:
-      - redis
-      - mariadb
-    environment:
-      - _APP_ENV
-      - _APP_WORKER_PER_CORE
-      - _APP_OPENSSL_KEY_V1
-      - _APP_DB_HOST
-      - _APP_DB_PORT
-      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
-      - _APP_REDIS_HOST
-      - _APP_REDIS_PORT
-      - _APP_REDIS_USER
-      - _APP_REDIS_PASS
-      - _APP_USAGE_STATS
-      - _APP_LOGGING_CONFIG
-      - _APP_STATS_RESOURCES_INTERVAL
-
-  appwrite-worker-stats-usage:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
-    entrypoint: worker-stats-usage
-    container_name: appwrite-worker-stats-usage
+    entrypoint: worker-usage
+    container_name: appwrite-worker-usage
    <<: *x-logging
    restart: unless-stopped
    networks:
@@ -744,11 +679,11 @@ $image = $this->getParam('image', '');
      - _APP_LOGGING_CONFIG
      - _APP_USAGE_AGGREGATION_INTERVAL

-  appwrite-worker-stats-usage-dump:
+  appwrite-worker-usage-dump:
    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
-    entrypoint: worker-stats-usage-dump
+    entrypoint: worker-usage-dump
    <<: *x-logging
-    container_name: appwrite-worker-stats-usage-dump
+    container_name: appwrite-worker-usage-dump
    restart: unless-stopped
    networks:
      - appwrite
@@ -863,7 +798,7 @@ $image = $this->getParam('image', '');
    <<: *x-logging
    restart: unless-stopped
    stop_signal: SIGINT
-    image: openruntimes/executor:0.6.11
+    image: openruntimes/executor:0.7.0
    networks:
      - appwrite
      - runtimes
@@ -875,9 +810,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_FUNCTIONS_INACTIVE_THRESHOLD
-      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_FUNCTIONS_MAINTENANCE_INTERVAL
-      - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
+      - 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_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD
      - OPR_EXECUTOR_ENV=$_APP_ENV
@@ -889,7 +824,6 @@ $image = $this->getParam('image', '');
      - OPR_EXECUTOR_STORAGE_S3_SECRET=$_APP_STORAGE_S3_SECRET
      - OPR_EXECUTOR_STORAGE_S3_REGION=$_APP_STORAGE_S3_REGION
      - OPR_EXECUTOR_STORAGE_S3_BUCKET=$_APP_STORAGE_S3_BUCKET
-      - OPR_EXECUTOR_STORAGE_S3_ENDPOINT=$_APP_STORAGE_S3_ENDPOINT
      - OPR_EXECUTOR_STORAGE_DO_SPACES_ACCESS_KEY=$_APP_STORAGE_DO_SPACES_ACCESS_KEY
      - OPR_EXECUTOR_STORAGE_DO_SPACES_SECRET=$_APP_STORAGE_DO_SPACES_SECRET
      - OPR_EXECUTOR_STORAGE_DO_SPACES_REGION=$_APP_STORAGE_DO_SPACES_REGION
@@ -13,10 +13,8 @@ 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;
-use Appwrite\Event\Webhook;
+use Appwrite\Event\Usage;
+use Appwrite\Event\UsageDump;
 use Appwrite\Platform\Appwrite;
 use Swoole\Runtime;
 use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
@@ -110,8 +108,6 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
            ->setNamespace('_' . $project->getInternalId());
    }

-    $database->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
-
    return $database;
 }, ['cache', 'register', 'message', 'project', 'dbForPlatform']);

@@ -173,58 +169,20 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatf
                ->setNamespace('_' . $project->getInternalId());
        }

-        $database->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
-
        return $database;
    };
 }, ['pools', 'dbForPlatform', 'cache']);

-Server::setResource('getLogsDB', function (Group $pools, Cache $cache) {
-    $database = null;
-    return function (?Document $project = null) use ($pools, $cache, $database) {
-        if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getInternalId());
-            return $database;
-        }
-
-        $dbAdapter = $pools
-            ->get('logs')
-            ->pop()
-            ->getResource();
-
-        $database = new Database(
-            $dbAdapter,
-            $cache
-        );
-
-        $database
-            ->setSharedTables(true)
-            ->setNamespace('logsV1')
-            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER)
-            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
-
-        // set tenant
-        if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getInternalId());
-        }
-
-        return $database;
-    };
-}, ['pools', 'cache']);
-
 Server::setResource('abuseRetention', function () {
-    return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400); // 1 day
+    return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400);
 });

-Server::setResource('auditRetention', function (Document $project) {
-    if ($project->getId() === 'console') {
-        return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE', 15778800)); // 6 months
-    }
-    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600)); // 14 days
-}, ['project']);
+Server::setResource('auditRetention', function () {
+    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600));
+});

 Server::setResource('executionRetention', function () {
-    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600)); // 14 days
+    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600));
 });

 Server::setResource('cache', function (Registry $register) {
@@ -274,12 +232,12 @@ Server::setResource('consumer', function (Group $pools) {
    return $pools->get('consumer')->pop()->getResource();
 }, ['pools']);

-Server::setResource('queueForStatsUsage', function (Publisher $publisher) {
-    return new StatsUsage($publisher);
+Server::setResource('queueForUsage', function (Publisher $publisher) {
+    return new Usage($publisher);
 }, ['publisher']);

-Server::setResource('queueForStatsUsageDump', function (Publisher $publisher) {
-    return new StatsUsageDump($publisher);
+Server::setResource('queueForUsageDump', function (Publisher $publisher) {
+    return new UsageDump($publisher);
 }, ['publisher']);

 Server::setResource('queueForDatabase', function (Publisher $publisher) {
@@ -310,18 +268,10 @@ 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']);
@@ -338,6 +288,10 @@ 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']);
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-php /usr/src/code/app/cli.php stats-resources $@
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-php /usr/src/code/app/worker.php stats-resources $@
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-php /usr/src/code/app/worker.php stats-usage $@
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-php /usr/src/code/app/worker.php stats-usage-dump $@
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+php /usr/src/code/app/worker.php usage $@
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+php /usr/src/code/app/worker.php usage-dump $@
@@ -14,7 +14,8 @@
        "test": "vendor/bin/phpunit",
        "lint": "vendor/bin/pint --test",
        "format": "vendor/bin/pint",
-        "bench": "vendor/bin/phpbench run --report=benchmark"
+        "bench": "vendor/bin/phpbench run --report=benchmark",
+        "check": "./vendor/bin/phpstan analyse -c phpstan.neon"
    },
    "autoload": {
        "psr-4": {
@@ -43,35 +44,35 @@
        "ext-openssl": "*",
        "ext-zlib": "*",
        "ext-sockets": "*",
-        "appwrite/php-runtimes": "0.16.*",
+        "appwrite/php-runtimes": "0.17.*",
        "appwrite/php-clamav": "2.0.*",
-        "utopia-php/abuse": "0.52.*",
+        "utopia-php/abuse": "0.49.*",
        "utopia-php/analytics": "0.10.*",
-        "utopia-php/audit": "0.56.*",
-        "utopia-php/cache": "0.12.*",
+        "utopia-php/audit": "0.49.*",
+        "utopia-php/cache": "0.11.*",
        "utopia-php/cli": "0.15.*",
        "utopia-php/config": "0.2.*",
-        "utopia-php/database": "dev-feat-multi-tenant-insert as 0.62.1",
+        "utopia-php/database": "0.58.4",
        "utopia-php/domains": "0.5.*",
        "utopia-php/dsn": "0.2.1",
-        "utopia-php/framework": "0.33.*",
+        "utopia-php/framework": "dev-fix-prevent-duplicate-compression as 0.33.99",
        "utopia-php/fetch": "0.3.*",
-        "utopia-php/image": "0.8.*",
+        "utopia-php/image": "0.7.*",
        "utopia-php/locale": "0.4.*",
        "utopia-php/logger": "0.6.*",
-        "utopia-php/messaging": "0.16.*",
-        "utopia-php/migration": "0.8.*",
+        "utopia-php/messaging": "0.14.*",
+        "utopia-php/migration": "0.6.*",
        "utopia-php/orchestration": "0.9.*",
-        "utopia-php/platform": "0.7.*",
-        "utopia-php/pools": "0.7.*",
+        "utopia-php/platform": "0.7.3",
+        "utopia-php/pools": "0.5.*",
        "utopia-php/preloader": "0.2.*",
-        "utopia-php/queue": "0.9.*",
+        "utopia-php/queue": "0.8.*",
        "utopia-php/registry": "0.5.*",
        "utopia-php/storage": "0.18.*",
        "utopia-php/swoole": "0.8.*",
        "utopia-php/system": "0.9.*",
        "utopia-php/telemetry": "0.1.*",
-        "utopia-php/vcs": "0.9.*",
+        "utopia-php/vcs": "0.8.*",
        "utopia-php/websocket": "0.1.*",
        "matomo/device-detector": "6.1.*",
        "dragonmantank/cron-expression": "3.3.2",
@@ -84,12 +85,13 @@
    },
    "require-dev": {
        "ext-fileinfo": "*",
-        "appwrite/sdk-generator": "0.40.*",
-        "phpunit/phpunit": "9.*",
+        "appwrite/sdk-generator": "0.39.32",
+        "phpunit/phpunit": "9.5.20",
        "swoole/ide-helper": "5.1.2",
-        "textalk/websocket": "1.5.*",
-        "laravel/pint": "1.*",
-        "phpbench/phpbench": "1.*"
+        "textalk/websocket": "1.5.7",
+        "laravel/pint": "^1.14",
+        "phpbench/phpbench": "^1.2",
+        "phpstan/phpstan": "1.8.*"
    },
    "provide": {
        "ext-phpiredis": "*"
@@ -99,8 +101,8 @@
            "php": "8.3"
        },
        "allow-plugins": {
-            "php-http/discovery": false,
-            "tbachert/spi": false
+            "php-http/discovery": true,
+            "tbachert/spi": true
        }
    }
 }
@@ -76,6 +76,7 @@ services:
      - appwrite-config:/storage/config:rw
      - appwrite-certificates:/storage/certificates:rw
      - appwrite-functions:/storage/functions:rw
+      - appwrite-builds:/storage/builds:rw
      - ./phpunit.xml:/usr/src/code/phpunit.xml
      - ./tests:/usr/src/code/tests
      - ./app:/usr/src/code/app
@@ -110,7 +111,7 @@ services:
      - _APP_OPTIONS_ABUSE
      - _APP_OPTIONS_ROUTER_PROTECTION
      - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
+      - _APP_OPTIONS_COMPUTE_FORCE_HTTPS
      - _APP_OPENSSL_KEY_V1
      - _APP_DOMAIN
      - _APP_DOMAIN_TARGET
@@ -140,7 +141,6 @@ services:
      - _APP_STORAGE_S3_SECRET
      - _APP_STORAGE_S3_REGION
      - _APP_STORAGE_S3_BUCKET
-      - _APP_STORAGE_S3_ENDPOINT
      - _APP_STORAGE_DO_SPACES_ACCESS_KEY
      - _APP_STORAGE_DO_SPACES_SECRET
      - _APP_STORAGE_DO_SPACES_REGION
@@ -157,12 +157,15 @@ services:
      - _APP_STORAGE_WASABI_SECRET
      - _APP_STORAGE_WASABI_REGION
      - _APP_STORAGE_WASABI_BUCKET
-      - _APP_FUNCTIONS_SIZE_LIMIT
-      - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
+      - _APP_COMPUTE_SIZE_LIMIT
+      - _APP_COMPUTE_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
      - _APP_FUNCTIONS_RUNTIMES
+      - _APP_SITES_RUNTIMES
+      - _APP_SITES_FRAMEWORKS
+      - _APP_DOMAIN_SITES
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
      - _APP_LOGGING_CONFIG
@@ -171,7 +174,6 @@ services:
      - _APP_MAINTENANCE_RETENTION_CACHE
      - _APP_MAINTENANCE_RETENTION_ABUSE
      - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
      - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
      - _APP_MAINTENANCE_RETENTION_SCHEDULES
      - _APP_SMS_PROVIDER
@@ -202,7 +204,7 @@ services:
  appwrite-console:
    <<: *x-logging
    container_name: appwrite-console
-    image: appwrite/console:5.2.53
+    image: appwrite/console:5.3.0-sites-rc.9
    restart: unless-stopped
    networks:
      - appwrite
@@ -367,7 +369,6 @@ services:
      - _APP_STORAGE_S3_SECRET
      - _APP_STORAGE_S3_REGION
      - _APP_STORAGE_S3_BUCKET
-      - _APP_STORAGE_S3_ENDPOINT
      - _APP_STORAGE_DO_SPACES_ACCESS_KEY
      - _APP_STORAGE_DO_SPACES_SECRET
      - _APP_STORAGE_DO_SPACES_REGION
@@ -390,8 +391,6 @@ services:
      - _APP_DATABASE_SHARED_TABLES
      - _APP_DATABASE_SHARED_TABLES_V1
      - _APP_EMAIL_CERTIFICATES
-      - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE

  appwrite-worker-databases:
    entrypoint: worker-databases
@@ -458,20 +457,19 @@ services:
      - _APP_VCS_GITHUB_APP_NAME
      - _APP_VCS_GITHUB_PRIVATE_KEY
      - _APP_VCS_GITHUB_APP_ID
-      - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
-      - _APP_FUNCTIONS_SIZE_LIMIT
+      - _APP_COMPUTE_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
+      - _APP_COMPUTE_SIZE_LIMIT
      - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
+      - _APP_OPTIONS_COMPUTE_FORCE_HTTPS
      - _APP_DOMAIN
      - _APP_STORAGE_DEVICE
      - _APP_STORAGE_S3_ACCESS_KEY
      - _APP_STORAGE_S3_SECRET
      - _APP_STORAGE_S3_REGION
      - _APP_STORAGE_S3_BUCKET
-      - _APP_STORAGE_S3_ENDPOINT
      - _APP_STORAGE_DO_SPACES_ACCESS_KEY
      - _APP_STORAGE_DO_SPACES_SECRET
      - _APP_STORAGE_DO_SPACES_REGION
@@ -489,6 +487,7 @@ services:
      - _APP_STORAGE_WASABI_REGION
      - _APP_STORAGE_WASABI_BUCKET
      - _APP_DATABASE_SHARED_TABLES
+      - _APP_DOMAIN_SITES

  appwrite-worker-certificates:
    entrypoint: worker-certificates
@@ -554,10 +553,10 @@ services:
      - _APP_DB_SCHEMA
      - _APP_DB_USER
      - _APP_DB_PASS
-      - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
+      - _APP_COMPUTE_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
      - _APP_USAGE_STATS
@@ -637,7 +636,6 @@ services:
      - _APP_STORAGE_S3_SECRET
      - _APP_STORAGE_S3_REGION
      - _APP_STORAGE_S3_BUCKET
-      - _APP_STORAGE_S3_ENDPOINT
      - _APP_STORAGE_DO_SPACES_ACCESS_KEY
      - _APP_STORAGE_DO_SPACES_SECRET
      - _APP_STORAGE_DO_SPACES_REGION
@@ -724,47 +722,15 @@ services:
      - _APP_MAINTENANCE_RETENTION_CACHE
      - _APP_MAINTENANCE_RETENTION_ABUSE
      - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
      - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
      - _APP_MAINTENANCE_RETENTION_SCHEDULES
      - _APP_MAINTENANCE_DELAY
      - _APP_DATABASE_SHARED_TABLES

-  appwrite-task-stats-resources:
-    container_name: appwrite-task-stats-resources
-    entrypoint: stats-resources
+  appwrite-worker-usage:
+    entrypoint: worker-usage
    <<: *x-logging
-    image: appwrite-dev
-    networks:
-      - appwrite
-    volumes:
-      - ./app:/usr/src/code/app
-      - ./src:/usr/src/code/src
-    depends_on:
-      - redis
-      - mariadb
-    environment:
-      - _APP_ENV
-      - _APP_WORKER_PER_CORE
-      - _APP_OPENSSL_KEY_V1
-      - _APP_DB_HOST
-      - _APP_DB_PORT
-      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
-      - _APP_REDIS_HOST
-      - _APP_REDIS_PORT
-      - _APP_REDIS_USER
-      - _APP_REDIS_PASS
-      - _APP_USAGE_STATS
-      - _APP_LOGGING_CONFIG
-      - _APP_DATABASE_SHARED_TABLES
-      - _APP_STATS_RESOURCES_INTERVAL
-
-  appwrite-worker-stats-resources:
-    entrypoint: worker-stats-resources
-    <<: *x-logging
-    container_name: appwrite-worker-stats-resources
+    container_name: appwrite-worker-usage
    image: appwrite-dev
    networks:
      - appwrite
@@ -792,10 +758,10 @@ services:
      - _APP_USAGE_AGGREGATION_INTERVAL
      - _APP_DATABASE_SHARED_TABLES

-  appwrite-worker-stats-usage:
-    entrypoint: worker-stats-usage
+  appwrite-worker-usage-dump:
+    entrypoint: worker-usage-dump
    <<: *x-logging
-    container_name: appwrite-worker-stats-usage
+    container_name: appwrite-worker-usage-dump
    image: appwrite-dev
    networks:
      - appwrite
@@ -823,38 +789,6 @@ services:
      - _APP_USAGE_AGGREGATION_INTERVAL
      - _APP_DATABASE_SHARED_TABLES

-  appwrite-worker-stats-usage-dump:
-    entrypoint: worker-stats-usage-dump
-    <<: *x-logging
-    container_name: appwrite-worker-stats-usage-dump
-    image: appwrite-dev
-    networks:
-      - appwrite
-    volumes:
-      - ./app:/usr/src/code/app
-      - ./src:/usr/src/code/src
-    depends_on:
-      - redis
-      - mariadb
-    environment:
-      - _APP_ENV
-      - _APP_WORKER_PER_CORE
-      - _APP_OPENSSL_KEY_V1
-      - _APP_DB_HOST
-      - _APP_DB_PORT
-      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
-      - _APP_REDIS_HOST
-      - _APP_REDIS_PORT
-      - _APP_REDIS_USER
-      - _APP_REDIS_PASS
-      - _APP_USAGE_STATS
-      - _APP_LOGGING_CONFIG
-      - _APP_USAGE_AGGREGATION_INTERVAL
-      - _APP_DATABASE_SHARED_TABLES
-      - _APP_STATS_USAGE_DUAL_WRITING_DBS
-
  appwrite-task-scheduler-functions:
    entrypoint: schedule-functions
    <<: *x-logging
@@ -951,7 +885,7 @@ services:
    hostname: exc1
    <<: *x-logging
    stop_signal: SIGINT
-    image: openruntimes/executor:0.6.11
+    image: openruntimes/executor:0.7.4
    restart: unless-stopped
    networks:
      - appwrite
@@ -964,22 +898,22 @@ services:
      # 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_FUNCTIONS_INACTIVE_THRESHOLD
-      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_FUNCTIONS_MAINTENANCE_INTERVAL
-      - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
+      - 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_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
+      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES,$_APP_SITES_RUNTIMES
      - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
-      - OPR_EXECUTOR_RUNTIME_VERSIONS=v2,v4
+      - OPR_EXECUTOR_RUNTIME_VERSIONS=v2,v4,v4rc
      - 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
      - OPR_EXECUTOR_STORAGE_S3_SECRET=$_APP_STORAGE_S3_SECRET
      - OPR_EXECUTOR_STORAGE_S3_REGION=$_APP_STORAGE_S3_REGION
      - OPR_EXECUTOR_STORAGE_S3_BUCKET=$_APP_STORAGE_S3_BUCKET
-      - OPR_EXECUTOR_STORAGE_S3_ENDPOINT=$_APP_STORAGE_S3_ENDPOINT
      - OPR_EXECUTOR_STORAGE_DO_SPACES_ACCESS_KEY=$_APP_STORAGE_DO_SPACES_ACCESS_KEY
      - OPR_EXECUTOR_STORAGE_DO_SPACES_SECRET=$_APP_STORAGE_DO_SPACES_SECRET
      - OPR_EXECUTOR_STORAGE_DO_SPACES_REGION=$_APP_STORAGE_DO_SPACES_REGION
@@ -0,0 +1,23 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Functions;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Functions functions = new Functions(client);
+
+functions.getDeploymentDownload(
+    "<FUNCTION_ID>", // functionId 
+    "<DEPLOYMENT_ID>", // deploymentId 
+    new CoroutineCallback<>((result, error) -> {
+        if (error != null) {
+            error.printStackTrace();
+            return;
+        }
+
+        Log.d("Appwrite", result.toString());
+    })
+);
+
@@ -0,0 +1,22 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Functions;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Functions functions = new Functions(client);
+
+functions.getTemplate(
+    "<TEMPLATE_ID>", // templateId 
+    new CoroutineCallback<>((result, error) -> {
+        if (error != null) {
+            error.printStackTrace();
+            return;
+        }
+
+        Log.d("Appwrite", result.toString());
+    })
+);
+
@@ -0,0 +1,25 @@
+import io.appwrite.Client;
+import io.appwrite.coroutines.CoroutineCallback;
+import io.appwrite.services.Functions;
+
+Client client = new Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>"); // Your project ID
+
+Functions functions = new Functions(client);
+
+functions.listTemplates(
+    listOf(), // runtimes (optional)
+    listOf(), // useCases (optional)
+    1, // limit (optional)
+    0, // offset (optional)
+    new CoroutineCallback<>((result, error) -> {
+        if (error != null) {
+            error.printStackTrace();
+            return;
+        }
+
+        Log.d("Appwrite", result.toString());
+    })
+);
+
@@ -0,0 +1,14 @@
+import io.appwrite.Client
+import io.appwrite.coroutines.CoroutineCallback
+import io.appwrite.services.Functions
+
+val client = Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>") // Your project ID
+
+val functions = Functions(client)
+
+val result = functions.getDeploymentDownload(
+    functionId = "<FUNCTION_ID>", 
+    deploymentId = "<DEPLOYMENT_ID>", 
+)
@@ -0,0 +1,13 @@
+import io.appwrite.Client
+import io.appwrite.coroutines.CoroutineCallback
+import io.appwrite.services.Functions
+
+val client = Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>") // Your project ID
+
+val functions = Functions(client)
+
+val result = functions.getTemplate(
+    templateId = "<TEMPLATE_ID>", 
+)
@@ -0,0 +1,16 @@
+import io.appwrite.Client
+import io.appwrite.coroutines.CoroutineCallback
+import io.appwrite.services.Functions
+
+val client = Client(context)
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>") // Your project ID
+
+val functions = Functions(client)
+
+val result = functions.listTemplates(
+    runtimes = listOf(), // (optional)
+    useCases = listOf(), // (optional)
+    limit = 1, // (optional)
+    offset = 0, // (optional)
+)
@@ -6,7 +6,7 @@ let client = Client()

 let account = Account(client)

-let session = try await account.updateMfaChallenge(
+let result = try await account.updateMfaChallenge(
    challengeId: "<CHALLENGE_ID>",
    otp: "<OTP>"
 )
@@ -0,0 +1,13 @@
+import Appwrite
+
+let client = Client()
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>") // Your project ID
+
+let functions = Functions(client)
+
+let bytes = try await functions.getDeploymentDownload(
+    functionId: "<FUNCTION_ID>",
+    deploymentId: "<DEPLOYMENT_ID>"
+)
+
@@ -0,0 +1,12 @@
+import Appwrite
+
+let client = Client()
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>") // Your project ID
+
+let functions = Functions(client)
+
+let templateFunction = try await functions.getTemplate(
+    templateId: "<TEMPLATE_ID>"
+)
+
@@ -0,0 +1,15 @@
+import Appwrite
+
+let client = Client()
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setProject("<YOUR_PROJECT_ID>") // Your project ID
+
+let functions = Functions(client)
+
+let templateFunctionList = try await functions.listTemplates(
+    runtimes: [], // optional
+    useCases: [], // optional
+    limit: 1, // optional
+    offset: 0 // optional
+)
+
@@ -6,7 +6,7 @@ Client client = Client()

 Account account = Account(client);

-Session result = await account.updateMfaChallenge(
+ result = await account.updateMfaChallenge(
    challengeId: '<CHALLENGE_ID>',
    otp: '<OTP>',
 );
@@ -0,0 +1,29 @@
+import 'package:appwrite/appwrite.dart';
+
+Client client = Client()
+    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
+    .setProject('<YOUR_PROJECT_ID>'); // Your project ID
+
+Functions functions = Functions(client);
+
+// Downloading file
+UInt8List bytes = await functions.getDeploymentDownload(
+    functionId: '<FUNCTION_ID>',
+    deploymentId: '<DEPLOYMENT_ID>',
+)
+
+final file = File('path_to_file/filename.ext');
+file.writeAsBytesSync(bytes);
+
+// Displaying image preview
+FutureBuilder(
+    future: functions.getDeploymentDownload(
+    functionId:'<FUNCTION_ID>' ,
+    deploymentId:'<DEPLOYMENT_ID>' ,
+), // Works for both public file and private file, for private files you need to be logged in
+    builder: (context, snapshot) {
+      return snapshot.hasData && snapshot.data != null
+          ? Image.memory(snapshot.data)
+          : CircularProgressIndicator();
+    }
+);
@@ -0,0 +1,11 @@
+import 'package:appwrite/appwrite.dart';
+
+Client client = Client()
+    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
+    .setProject('<YOUR_PROJECT_ID>'); // Your project ID
+
+Functions functions = Functions(client);
+
+TemplateFunction result = await functions.getTemplate(
+    templateId: '<TEMPLATE_ID>',
+);
@@ -0,0 +1,14 @@
+import 'package:appwrite/appwrite.dart';
+
+Client client = Client()
+    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
+    .setProject('<YOUR_PROJECT_ID>'); // Your project ID
+
+Functions functions = Functions(client);
+
+TemplateFunctionList result = await functions.listTemplates(
+    runtimes: [], // optional
+    useCases: [], // optional
+    limit: 1, // optional
+    offset: 0, // optional
+);
@@ -3,34 +3,6 @@ mutation {
        challengeId: "<CHALLENGE_ID>",
        otp: "<OTP>"
    ) {
-        _id
-        _createdAt
-        _updatedAt
-        userId
-        expire
-        provider
-        providerUid
-        providerAccessToken
-        providerAccessTokenExpiry
-        providerRefreshToken
-        ip
-        osCode
-        osName
-        osVersion
-        clientType
-        clientCode
-        clientName
-        clientVersion
-        clientEngine
-        clientEngineVersion
-        deviceName
-        deviceBrand
-        deviceModel
-        countryCode
-        countryName
-        current
-        factors
-        secret
-        mfaUpdatedAt
+        status
    }
 }
--- a/Show More
+++ b/Show More