Update lock

Merge remote-tracking branch 'origin/1.6.x' into poc-timeout
# Conflicts: # composer.lock
2026-05-26 13:51:13 +00:00 · 2025-01-30 22:58:48 +13:00 · 2025-01-30 22:52:16 +13:00 · 2025-01-29 23:41:43 +13:00 · 2025-01-28 22:12:13 +13:00 · 2025-01-28 22:10:00 +13:00
443 changed files with 67573 additions and 41964 deletions
@@ -18,12 +18,11 @@ _APP_SYSTEM_RESPONSE_FORMAT=
 _APP_OPTIONS_ABUSE=disabled
 _APP_OPTIONS_ROUTER_PROTECTION=disabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
-_APP_OPTIONS_COMPUTE_FORCE_HTTPS=disabled
+_APP_OPTIONS_FUNCTIONS_FORCE_HTTPS=disabled
 _APP_OPENSSL_KEY_V1=your-secret-key
 _APP_DOMAIN=traefik
 _APP_DOMAIN_FUNCTIONS=functions.localhost
-_APP_DOMAIN_SITES=sites.localhost
-_APP_DOMAIN_TARGET=test.appwrite.io
+_APP_DOMAIN_TARGET=localhost
 _APP_RULES_FORMAT=md5
 _APP_REDIS_HOST=redis
 _APP_REDIS_PORT=6379
@@ -40,7 +39,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
@@ -70,19 +68,17 @@ _APP_SMS_FROM=+123456789
 _APP_SMS_PROJECTS_DENY_LIST=
 _APP_STORAGE_LIMIT=30000000
 _APP_STORAGE_PREVIEW_LIMIT=20000000
-_APP_COMPUTE_SIZE_LIMIT=30000000
-_APP_COMPUTE_TIMEOUT=900
-_APP_COMPUTE_BUILD_TIMEOUT=900
-_APP_COMPUTE_CPUS=8
-_APP_COMPUTE_MEMORY=8192
-_APP_COMPUTE_INACTIVE_THRESHOLD=600
-_APP_COMPUTE_MAINTENANCE_INTERVAL=600
-_APP_COMPUTE_RUNTIMES_NETWORK=runtimes
+_APP_FUNCTIONS_SIZE_LIMIT=30000000
+_APP_FUNCTIONS_TIMEOUT=900
+_APP_FUNCTIONS_BUILD_TIMEOUT=900
+_APP_FUNCTIONS_CPUS=8
+_APP_FUNCTIONS_MEMORY=8192
+_APP_FUNCTIONS_INACTIVE_THRESHOLD=600
+_APP_FUNCTIONS_MAINTENANCE_INTERVAL=600
+_APP_FUNCTIONS_RUNTIMES_NETWORK=runtimes
 _APP_EXECUTOR_SECRET=your-secret-key
-_APP_EXECUTOR_HOST=http://exc1/v1
+_APP_EXECUTOR_HOST=http://proxy/v1
 _APP_FUNCTIONS_RUNTIMES=php-8.0,node-18.0,python-3.9,ruby-3.1
-_APP_SITES_RUNTIMES=static-1,node-22,flutter-3.29
-_APP_SITES_FRAMEWORKS=sveltekit,nextjs,nuxt,astro,remix,flutter,other,react,vue,analog,angular,vite
 _APP_MAINTENANCE_INTERVAL=86400
 _APP_MAINTENANCE_DELAY=
 _APP_MAINTENANCE_RETENTION_CACHE=2592000
@@ -90,7 +86,6 @@ _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
 _APP_MAINTENANCE_RETENTION_AUDIT=1209600
 _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
@@ -115,4 +110,6 @@ _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
+_APP_SLOW_QUERIES_MAX_HITS=5
+_APP_SLOW_QUERIES_TIMEOUT=15000
+_APP_SLOW_QUERIES_BLOCK=enabled
@@ -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

@@ -1,16 +0,0 @@
-name: "Static code analysis"
-
-on: [pull_request]
-jobs:
-  lint:
-    name: CodeQL
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Check out the repo
-      uses: actions/checkout@v2
-
-    - name: Run CodeQL
-      run: |
-        docker run --rm -v $PWD:/app composer:2.6 sh -c \
-        "composer install --profile --ignore-platform-reqs && composer check"
@@ -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,9 +66,6 @@ jobs:
          docker compose up -d
          sleep 10

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

@@ -130,72 +103,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,
-          Sites,
-          Proxy,
-          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: Wait for Open Runtimes
-        timeout-minutes: 3
-        run: |
-          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
-            echo "Waiting for Executor to come online"
-            sleep 1
-          done
-
-      - name: Run ${{ matrix.service }} tests with Project table mode
-        run: |
-          echo "Using project tables"
-          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:
@@ -212,8 +119,6 @@ jobs:
            Locale,
            Projects,
            Realtime,
-            Sites,
-            Proxy,
            Storage,
            Teams,
            Users,
@@ -223,6 +128,7 @@ jobs:
            Migrations
          ]
        tables-mode: [
+          'Project',
          'Shared V1',
          'Shared V2',
        ]
@@ -244,14 +150,6 @@ jobs:
          docker compose up -d
          sleep 30

-      - name: Wait for Open Runtimes
-        timeout-minutes: 3
-        run: |
-          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
-            echo "Waiting for Executor to come online"
-            sleep 1
-          done
-
      - name: Run ${{ matrix.service }} tests with ${{ matrix.tables-mode }} table mode
        run: |
          if [ "${{ matrix.tables-mode }}" == "Shared V1" ]; then
@@ -262,6 +160,10 @@ 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
      
          docker compose exec -T \
@@ -349,4 +251,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,7 +3,6 @@
 /node_modules/
 /tests/resources/storage/
 /tests/resources/functions/**/code.tar.gz
-/tests/resources/sites/**/code.tar.gz
 /app/sdks/*
 /.idea/
 !/.idea/workspace.xml
@@ -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,28 +163,6 @@ Other containes should be named the same as their service, for example `redis` s
 - [Encryption](https://medium.com/searchencrypt/what-is-encryption-how-does-it-work-e8f20e340537#:~:text=Encryption%20is%20a%20process%20that,%2C%20or%20decrypt%2C%20the%20information.)
 - [Hashing](https://searchsqlserver.techtarget.com/definition/hashing#:~:text=Hashing%20is%20the%20transformation%20of,it%20using%20the%20original%20value.)

-## Modules
-
-As Appwrite grows, we noticed approach of having all service endpoints in `app/controllers/api/[service].php` is not maintainable. Not only it creates massive files, it also doesnt contain all product's features such as workers or tasks. While there might still be some occurances of those controller files, we avoid it in all new development, and gradually migrate existing controllers to **HTTP modules**.
-
-### HTTP Endpoints
-
-Every endpoint file follows below structure, making it consistent with HTTP REST endpoint path:
-
-```
-src/Appwrite/Platform/Modules/[service]/Http/[resource]/[action].php
-```
-
-Tips and tricks:
-
-1. If endpoint doesn't have resource, use service name as resource name too
-> Example: `Modules/Sites/Http/Sites/Get.php`
-
-2. If there are multiple resources, use then all in folder structure
-> Example: `Modules/Sites/Http/Deployments/Builds/Create.php`
-
-3. Action can only be `Get`, `Create`, `Update`, `Delete` or `XList`
-
 ## Architecture

 Appwrite's current structure is a combination of both [Monolithic](https://en.wikipedia.org/wiki/Monolithic_application) and [Microservice](https://en.wikipedia.org/wiki/Microservices) architectures.
@@ -323,7 +301,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.

@@ -389,7 +367,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;
 ```
@@ -401,10 +379,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;
@@ -450,16 +428,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)
@@ -662,7 +640,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"

@@ -68,7 +68,6 @@ RUN chmod +x /usr/local/bin/doctor && \
    chmod +x /usr/local/bin/sdks && \
    chmod +x /usr/local/bin/specs && \
    chmod +x /usr/local/bin/ssl && \
-    chmod +x /usr/local/bin/screenshot && \
    chmod +x /usr/local/bin/test && \
    chmod +x /usr/local/bin/upgrade && \
    chmod +x /usr/local/bin/vars && \
@@ -86,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 @@
-> Appwrite Init has concluded! You can check out all the latest announcements [on our Init website](https://appwrite.io/init) :rocket:
+> 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) -->
@@ -37,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)
@@ -63,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

@@ -79,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
@@ -91,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
@@ -101,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.
@@ -110,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

@@ -196,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.

@@ -233,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;
@@ -21,12 +19,12 @@ use Utopia\DSN\DSN;
 use Utopia\Logger\Log;
 use Utopia\Platform\Service;
 use Utopia\Pools\Group;
-use Utopia\Queue\Publisher;
+use Utopia\Queue\Connection;
 use Utopia\Registry\Registry;
 use Utopia\System\System;

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

 // require controllers after overwriting runtimes
 require_once __DIR__ . '/controllers/general.php';
@@ -99,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

@@ -166,57 +160,18 @@ 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)
-            ->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();
+CLI::setResource('queue', function (Group $pools) {
+    return $pools->get('queue')->pop()->getResource();
 }, ['pools']);
-CLI::setResource('queueForFunctions', function (Publisher $publisher) {
-    return new Func($publisher);
-}, ['publisher']);
-CLI::setResource('queueForDeletes', function (Publisher $publisher) {
-    return new Delete($publisher);
-}, ['publisher']);
-CLI::setResource('queueForCertificates', function (Publisher $publisher) {
-    return new Certificate($publisher);
-}, ['publisher']);
+CLI::setResource('queueForFunctions', function (Connection $queue) {
+    return new Func($queue);
+}, ['queue']);
+CLI::setResource('queueForDeletes', function (Connection $queue) {
+    return new Delete($queue);
+}, ['queue']);
+CLI::setResource('queueForCertificates', function (Connection $queue) {
+    return new Certificate($queue);
+}, ['queue']);
 CLI::setResource('logError', function (Registry $register) {
    return function (Throwable $error, string $namespace, string $action) use ($register) {
        $logger = $register->get('logger');
@@ -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;
@@ -2637,4 +2637,93 @@ return [
            ]
        ]
    ],
+    'slowQueries' => [
+        '$collection' => ID::custom(Database::METADATA),
+        '$id' => ID::custom('slowQueries'),
+        'name' => 'slowQueries',
+        'attributes' => [
+            [
+                '$id' => ID::custom('blocked'),
+                'type' => Database::VAR_BOOLEAN,
+                'format' => '',
+                'size' => 0,
+                'signed' => true,
+                'required' => true,
+                'default' => false,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('count'),
+                'type' => Database::VAR_INTEGER,
+                'format' => '',
+                'size' => 0,
+                'signed' => true,
+                'required' => true,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('queries'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 410002,
+                'signed' => false,
+                'required' => true,
+                'default' => [],
+                'array' => false,
+                'filters' => ['json'],
+            ],
+            [
+                '$id' => ID::custom('path'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 2500,
+                'signed' => false,
+                'required' => true,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('databaseId'),
+                'type' => Database::VAR_STRING,
+                'signed' => true,
+                'size' => Database::LENGTH_KEY,
+                'format' => '',
+                'filters' => [],
+                'required' => true,
+                'default' => null,
+                'array' => false,
+            ],
+            [
+                '$id' => ID::custom('collectionId'),
+                'type' => Database::VAR_STRING,
+                'signed' => true,
+                'size' => Database::LENGTH_KEY,
+                'format' => '',
+                'filters' => [],
+                'required' => true,
+                'default' => null,
+                'array' => false,
+            ],
+        ],
+        'indexes' => [
+            [
+                '$id' => '_key_database_id',
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['databaseId', 'collectionId'],
+                'lengths' => [],
+                'orders' => []
+            ],
+            [
+                '$id' => '_key_blocked',
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['blocked', 'databaseId', 'collectionId'],
+                'lengths' => [],
+                'orders' => []
+            ]
+        ],
+    ],
 ];
@@ -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;
@@ -1013,10 +1013,10 @@ return [
                'filters' => [],
            ],
            [
-                '$id' => ID::custom('type'), // 'api', 'redirect', 'deployment' (site or function)
+                '$id' => ID::custom('resourceType'),
                'type' => Database::VAR_STRING,
                'format' => '',
-                'size' => 32,
+                'size' => 100,
                'signed' => true,
                'required' => true,
                'default' => null,
@@ -1024,32 +1024,10 @@ return [
                'filters' => [],
            ],
            [
-                '$id' => ID::custom('trigger'), // 'manual', 'deployment', '' (empty)
+                '$id' => ID::custom('resourceInternalId'),
                'type' => Database::VAR_STRING,
                'format' => '',
-                'size' => 32,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('redirectUrl'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 2048,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('redirectStatusCode'),
-                'type' => Database::VAR_INTEGER,
-                'format' => '',
-                'size' => 0,
+                'size' => Database::LENGTH_KEY,
                'signed' => true,
                'required' => false,
                'default' => null,
@@ -1057,68 +1035,13 @@ return [
                'filters' => [],
            ],
            [
-                '$id' => ID::custom('deploymentResourceType'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 32,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('deploymentId'),
+                '$id' => ID::custom('resourceId'),
                'type' => Database::VAR_STRING,
                'format' => '',
                'size' => Database::LENGTH_KEY,
                'signed' => true,
                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('deploymentInternalId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('deploymentResourceId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('deploymentResourceInternalId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('deploymentVcsProviderBranch'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
+                'default' => null,
                'array' => false,
                'filters' => [],
            ],
@@ -1143,27 +1066,9 @@ return [
                'default' => null,
                'array' => false,
                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('search'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
+            ]
        ],
        'indexes' => [
-            [
-                '$id' => ID::custom('_key_search'),
-                'type' => Database::INDEX_FULLTEXT,
-                'attributes' => ['search'],
-                'lengths' => [],
-                'orders' => [],
-            ],
            [
                '$id' => ID::custom('_key_domain'),
                'type' => Database::INDEX_UNIQUE,
@@ -1186,59 +1091,24 @@ return [
                'orders' => [Database::ORDER_ASC],
            ],
            [
-                '$id' => '_key_type',
+                '$id' => '_key_resourceInternalId',
                'type' => Database::INDEX_KEY,
-                'attributes' => ['type'],
-                'lengths' => [32],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => '_key_trigger',
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['trigger'],
-                'lengths' => [32],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => '_key_deploymentResourceType',
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['deploymentResourceType'],
-                'lengths' => [32],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => '_key_deploymentResourceId',
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['deploymentResourceId'],
+                'attributes' => ['resourceInternalId'],
                'lengths' => [Database::LENGTH_KEY],
                'orders' => [Database::ORDER_ASC],
            ],
            [
-                '$id' => '_key_deploymentResourceInternalId',
+                '$id' => '_key_resourceId',
                'type' => Database::INDEX_KEY,
-                'attributes' => ['deploymentResourceInternalId'],
+                'attributes' => ['resourceId'],
                'lengths' => [Database::LENGTH_KEY],
                'orders' => [Database::ORDER_ASC],
            ],
            [
-                '$id' => '_key_deploymentId',
+                '$id' => '_key_resourceType',
                'type' => Database::INDEX_KEY,
-                'attributes' => ['deploymentId'],
-                'lengths' => [Database::LENGTH_KEY],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => '_key_deploymentInternalId',
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['deploymentInternalId'],
-                'lengths' => [Database::LENGTH_KEY],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => '_key_deploymentVcsProviderBranch',
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['deploymentVcsProviderBranch'],
-                'lengths' => [Database::LENGTH_KEY],
+                'attributes' => ['resourceType'],
+                'lengths' => [],
                'orders' => [Database::ORDER_ASC],
            ],
        ],
@@ -1315,39 +1185,6 @@ return [
                'default' => false,
                'array' => false,
            ],
-            [
-                '$id' => ID::custom('personalAccessToken'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 256,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['encrypt'],
-            ],
-            [
-                '$id' => ID::custom('personalAccessTokenExpiry'),
-                'type' => Database::VAR_DATETIME,
-                'format' => '',
-                'size' => 0,
-                'signed' => false,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['datetime'],
-            ],
-            [
-                '$id' => ID::custom('personalRefreshToken'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 256,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['encrypt'],
-            ],
        ],
        'indexes' => [

@@ -569,7 +569,7 @@ return [
                'filters' => [],
            ],
            [
-                '$id' => ID::custom('deploymentId'),
+                '$id' => ID::custom('deployment'),
                'type' => Database::VAR_STRING,
                'format' => '',
                'size' => Database::LENGTH_KEY,
@@ -674,7 +674,7 @@ return [
                'size' => 8,
                'signed' => true,
                'required' => false,
-                'default' => 'v5',
+                'default' => 'v4',
                'array' => false,
                'filters' => [],
            ],
@@ -708,7 +708,7 @@ return [
                'size' => 128,
                'signed' => false,
                'required' => false,
-                'default' => APP_COMPUTE_SPECIFICATION_DEFAULT,
+                'default' => APP_FUNCTION_SPECIFICATION_DEFAULT,
                'filters' => [],
            ],
            [
@@ -788,372 +788,15 @@ return [
                'orders' => [Database::ORDER_ASC],
            ],
            [
-                '$id' => ID::custom('_key_deploymentId'),
+                '$id' => ID::custom('_key_deployment'),
                'type' => Database::INDEX_KEY,
-                'attributes' => ['deploymentId'],
+                'attributes' => ['deployment'],
                'lengths' => [],
                'orders' => [Database::ORDER_ASC],
            ]
        ],
    ],

-    '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'),
@@ -1192,6 +835,28 @@ return [
                'array' => false,
                'filters' => [],
            ],
+            [
+                '$id' => ID::custom('buildInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('buildId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                'array' => false,
                '$id' => ID::custom('entrypoint'),
@@ -1205,28 +870,17 @@ return [
            ],
            [
                'array' => false,
-                '$id' => ID::custom('buildCommands'),
+                '$id' => ID::custom('commands'),
                'type' => Database::VAR_STRING,
                'format' => '',
-                'size' => 16384,
+                'size' => 2048,
                'signed' => true,
                'required' => false,
                'default' => null,
                'filters' => [],
            ],
            [
-                'array' => false,
-                '$id' => ID::custom('buildOutput'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('sourcePath'),
+                '$id' => ID::custom('path'),
                'type' => Database::VAR_STRING,
                'format' => '',
                'size' => 2048,
@@ -1240,7 +894,7 @@ return [
                '$id' => ID::custom('type'),
                'type' => Database::VAR_STRING,
                'format' => '',
-                'size' => 32,
+                'size' => 2048,
                'signed' => true,
                'required' => true,
                'default' => null,
@@ -1419,7 +1073,7 @@ return [
                'array' => false,
            ],
            [
-                '$id' => ID::custom('sourceSize'),
+                '$id' => ID::custom('size'),
                'type' => Database::VAR_INTEGER,
                'format' => '',
                'size' => 0,
@@ -1430,7 +1084,7 @@ return [
                'filters' => [],
            ],
            [
-                '$id' => ID::custom('sourceMetadata'),
+                '$id' => ID::custom('metadata'),
                'type' => Database::VAR_STRING,
                'format' => '',
                'size' => 16384, // https://tools.ietf.org/html/rfc4288#section-4.2
@@ -1441,7 +1095,7 @@ return [
                'filters' => ['json'],
            ],
            [
-                '$id' => ID::custom('sourceChunksTotal'),
+                '$id' => ID::custom('chunksTotal'),
                'type' => Database::VAR_INTEGER,
                'format' => '',
                'size' => 0,
@@ -1452,7 +1106,7 @@ return [
                'filters' => [],
            ],
            [
-                '$id' => ID::custom('sourceChunksUploaded'),
+                '$id' => ID::custom('chunksUploaded'),
                'type' => Database::VAR_INTEGER,
                'format' => '',
                'size' => 0,
@@ -1483,105 +1137,6 @@ return [
                'default' => false,
                'array' => false,
                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('screenshotLight'), // File ID from 'screenshots' Console bucket
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 32,
-                'signed' => false,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('screenshotDark'), // File ID from 'screenshots' Console bucket
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 32,
-                'signed' => false,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('buildStartAt'),
-                'type' => Database::VAR_DATETIME,
-                'format' => '',
-                'size' => 0,
-                'signed' => false,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['datetime'],
-            ],
-            [
-                '$id' => ID::custom('buildEndAt'),
-                'type' => Database::VAR_DATETIME,
-                'format' => '',
-                'size' => 0,
-                'signed' => false,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['datetime'],
-            ],
-            [
-                '$id' => ID::custom('buildDuration'),
-                'type' => Database::VAR_INTEGER,
-                'format' => '',
-                'size' => 0,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('buildSize'),
-                'type' => Database::VAR_INTEGER,
-                'format' => '',
-                'size' => 0,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('status'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16,
-                'signed' => true,
-                'required' => true,
-                'default' => 'waiting',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('buildPath'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('buildLogs'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 1000000,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
            ]
        ],
        'indexes' => [
@@ -1607,23 +1162,16 @@ return [
                'orders' => [],
            ],
            [
-                '$id' => ID::custom('_key_sourceSize'),
+                '$id' => ID::custom('_key_size'),
                'type' => Database::INDEX_KEY,
-                'attributes' => ['sourceSize'],
+                'attributes' => ['size'],
                'lengths' => [],
                'orders' => [Database::ORDER_ASC],
            ],
            [
-                '$id' => ID::custom('_key_buildSize'),
+                '$id' => ID::custom('_key_buildId'),
                'type' => Database::INDEX_KEY,
-                'attributes' => ['buildSize'],
-                'lengths' => [],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_buildDuration'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['buildDuration'],
+                'attributes' => ['buildId'],
                'lengths' => [],
                'orders' => [Database::ORDER_ASC],
            ],
@@ -1634,19 +1182,155 @@ return [
                'lengths' => [],
                'orders' => [Database::ORDER_ASC],
            ],
+        ],
+    ],
+
+    'builds' => [
+        '$collection' => ID::custom(Database::METADATA),
+        '$id' => ID::custom('builds'),
+        'name' => 'Builds',
+        'attributes' => [
            [
-                '$id' => ID::custom('_key_type'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['type'],
-                'lengths' => [32],
-                'orders' => [Database::ORDER_ASC],
-            ],  [
-                '$id' => ID::custom('_key_status'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['status'],
-                'lengths' => [16],
-                'orders' => [Database::ORDER_ASC],
+                '$id' => ID::custom('startTime'),
+                'type' => Database::VAR_DATETIME,
+                'format' => '',
+                'size' => 0,
+                'signed' => false,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => ['datetime'],
            ],
+            [
+                '$id' => ID::custom('endTime'),
+                'type' => Database::VAR_DATETIME,
+                'format' => '',
+                'size' => 0,
+                'signed' => false,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => ['datetime'],
+            ],
+            [
+                '$id' => ID::custom('duration'),
+                'type' => Database::VAR_INTEGER,
+                'format' => '',
+                'size' => 0,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('size'),
+                'type' => Database::VAR_INTEGER,
+                'format' => '',
+                'size' => 0,
+                '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('runtime'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 2048,
+                'signed' => true,
+                'required' => true,
+                'default' => '',
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('status'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 256,
+                'signed' => true,
+                'required' => true,
+                'default' => 'processing',
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('path'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 2048,
+                'signed' => true,
+                'required' => false,
+                'default' => '',
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('logs'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 1000000,
+                'signed' => true,
+                'required' => false,
+                'default' => '',
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('sourceType'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 2048,
+                'signed' => true,
+                'required' => true,
+                'default' => 'local',
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('source'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 2048,
+                'signed' => true,
+                'required' => true,
+                'default' => '',
+                'array' => false,
+                'filters' => [],
+            ]
+        ],
+        'indexes' => [
+            [
+                '$id' => ID::custom('_key_deployment'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['deploymentId'],
+                'lengths' => [Database::LENGTH_KEY],
+                'orders' => [Database::ORDER_ASC],
+            ]
        ],
    ],

@@ -1656,7 +1340,7 @@ return [
        'name' => 'Executions',
        'attributes' => [
            [
-                '$id' => ID::custom('resourceInternalId'),
+                '$id' => ID::custom('functionInternalId'),
                'type' => Database::VAR_STRING,
                'format' => '',
                'size' => Database::LENGTH_KEY,
@@ -1667,18 +1351,7 @@ return [
                'filters' => [],
            ],
            [
-                '$id' => ID::custom('resourceId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('resourceType'),
+                '$id' => ID::custom('functionId'),
                'type' => Database::VAR_STRING,
                'format' => '',
                'size' => Database::LENGTH_KEY,
@@ -1820,6 +1493,17 @@ return [
                'array' => false,
                'filters' => ['json'],
            ],
+            [
+                '$id' => ID::custom('search'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 16384,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('scheduledAt'),
                'type' => Database::VAR_DATETIME,
@@ -1856,12 +1540,19 @@ return [
        ],
        'indexes' => [
            [
-                '$id' => ID::custom('_key_resource'),
+                '$id' => ID::custom('_key_function'),
                'type' => Database::INDEX_KEY,
-                'attributes' => ['resourceInternalId', 'resourceType', 'resourceId'],
+                'attributes' => ['functionId'],
                'lengths' => [Database::LENGTH_KEY],
                'orders' => [Database::ORDER_ASC],
            ],
+            [
+                '$id' => ID::custom('_fulltext_search'),
+                'type' => Database::INDEX_FULLTEXT,
+                'attributes' => ['search'],
+                'lengths' => [],
+                'orders' => [],
+            ],
            [
                '$id' => ID::custom('_key_trigger'),
                'type' => Database::INDEX_KEY,
@@ -1974,17 +1665,6 @@ return [
                'array' => false,
                'filters' => ['encrypt']
            ],
-            [
-                '$id' => ID::custom('secret'),
-                'type' => Database::VAR_BOOLEAN,
-                'format' => '',
-                'size' => 0,
-                'signed' => true,
-                'required' => false,
-                'default' => false,
-                'array' => false,
-                'filters' => [],
-            ],
            [
                '$id' => ID::custom('search'),
                'type' => Database::VAR_STRING,
@@ -1,52 +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
-    ],
-    '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,13 +375,6 @@ return [
        'code' => 409,
    ],

-    /** Console */
-    Exception::RESOURCE_ALREADY_EXISTS => [
-        'name' => Exception::RESOURCE_ALREADY_EXISTS,
-        'description' => 'Resource with the requested ID already exists. Please choose a different ID and try again.',
-        'code' => 409,
-    ],
-
    /** Membership */
    Exception::MEMBERSHIP_NOT_FOUND => [
        'name' => Exception::MEMBERSHIP_NOT_FOUND,
@@ -527,7 +520,7 @@ return [
        'code' => 404,
    ],
    Exception::FUNCTION_ENTRYPOINT_MISSING => [
-        'name' => Exception::FUNCTION_ENTRYPOINT_MISSING,
+        'name' => Exception::FUNCTION_RUNTIME_UNSUPPORTED,
        'description' => 'Entrypoint for your Appwrite Function is missing. Please specify it when making deployment or update the entrypoint under your function\'s "Settings" > "Configuration" > "Entrypoint".',
        'code' => 404,
    ],
@@ -541,28 +534,6 @@ return [
        'description' => 'Function Template with the requested ID could not be found.',
        'code' => 404,
    ],
-    Exception::FUNCTION_RUNTIME_NOT_DETECTED => [
-        'name' => Exception::FUNCTION_RUNTIME_NOT_DETECTED,
-        'description' => 'Function runtime could not be detected.',
-        'code' => 400,
-    ],
-
-    /** 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 => [
@@ -606,13 +577,6 @@ return [
        'code' => 400,
    ],

-    /** Logs */
-    Exception::LOG_NOT_FOUND => [
-        'name' => Exception::LOG_NOT_FOUND,
-        'description' => 'Log with the requested ID could not be found.',
-        'code' => 404,
-    ],
-
    /** Databases */
    Exception::DATABASE_NOT_FOUND => [
        'name' => Exception::DATABASE_NOT_FOUND,
@@ -880,11 +844,6 @@ return [
        'description' => 'Variable with the same ID already exists in this project. Try again with a different ID.',
        'code' => 409,
    ],
-    Exception::VARIABLE_CANNOT_UNSET_SECRET => [
-        'name' => Exception::VARIABLE_CANNOT_UNSET_SECRET,
-        'description' => 'Secret variables cannot be marked as non-secret. Please re-create the variable if this is your intention.',
-        'code' => 400,
-    ],
    Exception::GRAPHQL_NO_QUERY => [
        'name' => Exception::GRAPHQL_NO_QUERY,
        'description' => 'Param "query" is not optional.',
@@ -1064,4 +1023,16 @@ return [
        'description' => 'Target has an invalid provider type.',
        'code' => 400,
    ],
+
+    /* Slow queries */
+    Exception::QUERY_BLOCKED => [
+        'name' => Exception::QUERY_BLOCKED,
+        'description' => 'Request blocked after exceeding the maximum number of timeouts',
+        'code' => 403,
+    ],
+    Exception::QUERY_TIMEOUT => [
+        'name' => Exception::QUERY_TIMEOUT,
+        'description' => 'Request timed out, this query will be blocked if it keeps timing out, try adjusting the "queries" parameter or adding indexes for the queried attributes.',
+        'code' => 408,
+    ],
 ];
@@ -217,34 +217,6 @@ return [
            ],
        ]
    ],
-    'sites' => [
-        '$model' => Response::MODEL_SITE,
-        '$resource' => true,
-        '$description' => 'This event triggers on any sites event.',
-        'deployments' => [
-            '$model' => Response::MODEL_DEPLOYMENT,
-            '$resource' => true,
-            '$description' => 'This event triggers on any deployments event.',
-            'create' => [
-                '$description' => 'This event triggers when a deployment is created.',
-            ],
-            'delete' => [
-                '$description' => 'This event triggers when a deployment is deleted.'
-            ],
-            'update' => [
-                '$description' => 'This event triggers when a deployment is updated.'
-            ],
-        ],
-        'create' => [
-            '$description' => 'This event triggers when a site is created.'
-        ],
-        'delete' => [
-            '$description' => 'This event triggers when a site is deleted.',
-        ],
-        'update' => [
-            '$description' => 'This event triggers when a site is updated.',
-        ]
-    ],
    'functions' => [
        '$model' => Response::MODEL_FUNCTION,
        '$resource' => true,
@@ -1,266 +0,0 @@
-<?php
-
-/**
- * List of Appwrite Sites supported frameworks
- */
-
-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 [
-    'analog' => [
-        'key' => 'analog',
-        'name' => 'Analog',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'sh /usr/local/server/helpers/analog/bundle.sh',
-        'envCommand' => 'source /usr/local/server/helpers/analog/env.sh',
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist/analog',
-                'startCommand' => 'sh helpers/analog/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist/analog/public',
-                'startCommand' => 'sh helpers/server.sh',
-                'fallbackFile' => 'index.html'
-            ]
-        ]
-    ],
-    'angular' => [
-        'key' => 'angular',
-        'name' => 'Angular',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'sh /usr/local/server/helpers/angular/bundle.sh',
-        'envCommand' => 'source /usr/local/server/helpers/angular/env.sh',
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist/angular',
-                'startCommand' => 'sh helpers/angular/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist/angular/browser',
-                'startCommand' => 'sh helpers/server.sh',
-                'fallbackFile' => 'index.csr.html'
-            ]
-        ]
-    ],
-    'nextjs' => [
-        'key' => 'nextjs',
-        'name' => 'Next.js',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'sh /usr/local/server/helpers/next-js/bundle.sh',
-        'envCommand' => 'source /usr/local/server/helpers/next-js/env.sh',
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './.next',
-                'startCommand' => 'sh helpers/next-js/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './out',
-                'startCommand' => 'sh helpers/server.sh',
-            ]
-        ]
-    ],
-    'react' => [
-        'key' => 'react',
-        'name' => 'React',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'sh helpers/server.sh',
-                'fallbackFile' => 'index.html'
-            ]
-        ]
-    ],
-    'nuxt' => [
-        'key' => 'nuxt',
-        'name' => 'Nuxt',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'sh /usr/local/server/helpers/nuxt/bundle.sh',
-        'envCommand' => 'source /usr/local/server/helpers/nuxt/env.sh',
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './.output',
-                'startCommand' => 'sh helpers/nuxt/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run generate',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './output/public',
-                'startCommand' => 'sh helpers/server.sh',
-            ]
-        ]
-    ],
-    'vue' => [
-        'key' => 'vue',
-        'name' => 'Vue.js',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'sh helpers/server.sh',
-                'fallbackFile' => 'index.html'
-            ]
-        ]
-    ],
-    'sveltekit' => [
-        'key' => 'sveltekit',
-        'name' => 'SvelteKit',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'sh /usr/local/server/helpers/sveltekit/bundle.sh',
-        'envCommand' => 'source /usr/local/server/helpers/sveltekit/env.sh',
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './build',
-                'startCommand' => 'sh helpers/sveltekit/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './build',
-                'startCommand' => 'sh helpers/server.sh',
-            ]
-        ]
-    ],
-    'astro' => [
-        'key' => 'astro',
-        'name' => 'Astro',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'sh /usr/local/server/helpers/astro/bundle.sh',
-        'envCommand' => 'source /usr/local/server/helpers/astro/env.sh',
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'sh helpers/astro/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'sh helpers/server.sh',
-            ]
-        ]
-    ],
-    'remix' => [
-        'key' => 'remix',
-        'name' => 'Remix',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'sh /usr/local/server/helpers/remix/bundle.sh',
-        'envCommand' => 'source /usr/local/server/helpers/remix/env.sh',
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './build',
-                'startCommand' => 'sh helpers/remix/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './build/client',
-                'startCommand' => 'sh helpers/server.sh',
-            ]
-        ]
-    ],
-    'flutter' => [
-        'key' => 'flutter',
-        'name' => 'Flutter',
-        'buildRuntime' => 'flutter-3.29',
-        'runtimes' => getVersions($templateRuntimes['FLUTTER']['versions'], 'flutter'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'flutter build web',
-                'installCommand' => '',
-                'outputDirectory' => './build/web',
-                'startCommand' => 'sh helpers/server.sh',
-            ],
-        ],
-    ],
-    'vite' => [
-        'key' => 'vite',
-        'name' => 'Vite',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'sh helpers/server.sh',
-            ],
-        ]
-    ],
-    'other' => [
-        'key' => 'other',
-        'name' => 'Other',
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => '',
-                'installCommand' => '',
-                'outputDirectory' => './',
-                'startCommand' => 'sh helpers/server.sh',
-            ],
-        ]
-    ],
-];
@@ -1,8 +1,39 @@
 <?php

-use Utopia\Config\Config;
-
-$templateRuntimes = Config::getParam('template-runtimes');
+const TEMPLATE_RUNTIMES = [
+    'NODE' => [
+        'name' => 'node',
+        'versions' => ['22', '21.0', '20.0', '19.0', '18.0', '16.0', '14.5']
+    ],
+    'PYTHON' => [
+        'name' => 'python',
+        'versions' => ['3.12', '3.11', '3.10', '3.9', '3.8']
+    ],
+    'DART' => [
+        'name' => 'dart',
+        'versions' => ['3.5', '3.3', '3.1', '3.0', '2.19', '2.18', '2.17', '2.16']
+    ],
+    'GO' => [
+        'name' => 'go',
+        'versions' => ['1.23']
+    ],
+    'PHP' => [
+        'name' => 'php',
+        'versions' => ['8.3', '8.2', '8.1', '8.0']
+    ],
+    'DENO' => [
+        'name' => 'deno',
+        'versions' => ['2.0', '1.46', '1.40', '1.35', '1.24', '1.21']
+    ],
+    'BUN' => [
+        'name' => 'bun',
+        'versions' => ['1.1', '1.0']
+    ],
+    'RUBY' => [
+        'name' => 'ruby',
+        'versions' => ['3.3', '3.2', '3.1', '3.0']
+    ],
+];

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

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

 use Appwrite\Runtimes\Runtimes;

-return (new Runtimes('v5'))->getAll();
+return (new Runtimes('v4'))->getAll();
@@ -1,6 +1,6 @@
 <?php

-use Appwrite\Platform\Modules\Compute\Specification;
+use Appwrite\Functions\Specification;

 return [
    Specification::S_05VCPU_512MB => [
@@ -64,18 +64,6 @@ return [ // List of publicly visible scopes
    'functions.write' => [
        'description' => 'Access to create, update, and delete your project\'s functions and code deployments',
    ],
-    'sites.read' => [
-        'description' => 'Access to read your project\'s sites and deployments',
-    ],
-    'sites.write' => [
-        'description' => 'Access to create, update, and delete your project\'s sites and deployments',
-    ],
-    'log.read' => [
-        'description' => 'Access to read your site\'s logs',
-    ],
-    'log.write' => [
-        'description' => 'Access to update, and delete your site\'s logs',
-    ],
    'execution.read' => [
        'description' => 'Access to read your project\'s execution logs',
    ],
@@ -173,25 +173,12 @@ return [
        'optional' => false,
        'icon' => '',
    ],
-    'sites' => [
-        'key' => 'sites',
-        'name' => 'Sites',
-        'subtitle' => 'The Sites Service allows you view, create and manage your web applications.',
-        'description' => '/docs/services/sites.md',
-        'controller' => '', // Uses modules
-        'sdk' => true,
-        'docs' => true,
-        'docsUrl' => 'https://appwrite.io/docs/sites',
-        'tests' => false,
-        'optional' => true,
-        'icon' => '', // TODO: Update icon later
-    ],
    'functions' => [
        'key' => 'functions',
        'name' => 'Functions',
        'subtitle' => 'The Functions Service allows you view, create and manage your Cloud Functions.',
        'description' => '/docs/services/functions.md',
-        'controller' => '', // Uses modules
+        'controller' => 'api/functions.php',
        'sdk' => true,
        'docs' => true,
        'docsUrl' => 'https://appwrite.io/docs/functions',
@@ -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.7.0",
+        "version": "1.6.1",
        "title": "Appwrite",
        "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
        "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -43,7 +43,7 @@
                },
                "x-appwrite": {
                    "method": "get",
-                    "weight": 10,
+                    "weight": 9,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -91,7 +91,7 @@
                },
                "x-appwrite": {
                    "method": "create",
-                    "weight": 9,
+                    "weight": 8,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -175,7 +175,7 @@
                },
                "x-appwrite": {
                    "method": "updateEmail",
-                    "weight": 35,
+                    "weight": 34,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -250,7 +250,7 @@
                },
                "x-appwrite": {
                    "method": "listIdentities",
-                    "weight": 58,
+                    "weight": 57,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -308,7 +308,7 @@
                },
                "x-appwrite": {
                    "method": "deleteIdentity",
-                    "weight": 59,
+                    "weight": 58,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -370,7 +370,7 @@
                },
                "x-appwrite": {
                    "method": "createJWT",
-                    "weight": 30,
+                    "weight": 29,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -418,7 +418,7 @@
                },
                "x-appwrite": {
                    "method": "listLogs",
-                    "weight": 32,
+                    "weight": 31,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -483,7 +483,7 @@
                },
                "x-appwrite": {
                    "method": "updateMFA",
-                    "weight": 45,
+                    "weight": 44,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -552,7 +552,7 @@
                },
                "x-appwrite": {
                    "method": "createMfaAuthenticator",
-                    "weight": 47,
+                    "weight": 46,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -617,7 +617,7 @@
                },
                "x-appwrite": {
                    "method": "updateMfaAuthenticator",
-                    "weight": 48,
+                    "weight": 47,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -694,7 +694,7 @@
                },
                "x-appwrite": {
                    "method": "deleteMfaAuthenticator",
-                    "weight": 52,
+                    "weight": 51,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -761,7 +761,7 @@
                },
                "x-appwrite": {
                    "method": "createMfaChallenge",
-                    "weight": 53,
+                    "weight": 52,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -834,7 +834,7 @@
                },
                "x-appwrite": {
                    "method": "updateMfaChallenge",
-                    "weight": 54,
+                    "weight": 53,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -909,7 +909,7 @@
                },
                "x-appwrite": {
                    "method": "listMfaFactors",
-                    "weight": 46,
+                    "weight": 45,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -959,7 +959,7 @@
                },
                "x-appwrite": {
                    "method": "getMfaRecoveryCodes",
-                    "weight": 51,
+                    "weight": 50,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1007,7 +1007,7 @@
                },
                "x-appwrite": {
                    "method": "createMfaRecoveryCodes",
-                    "weight": 49,
+                    "weight": 48,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1055,7 +1055,7 @@
                },
                "x-appwrite": {
                    "method": "updateMfaRecoveryCodes",
-                    "weight": 50,
+                    "weight": 49,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1105,7 +1105,7 @@
                },
                "x-appwrite": {
                    "method": "updateName",
-                    "weight": 33,
+                    "weight": 32,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1174,7 +1174,7 @@
                },
                "x-appwrite": {
                    "method": "updatePassword",
-                    "weight": 34,
+                    "weight": 33,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1248,7 +1248,7 @@
                },
                "x-appwrite": {
                    "method": "updatePhone",
-                    "weight": 36,
+                    "weight": 35,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1323,7 +1323,7 @@
                },
                "x-appwrite": {
                    "method": "getPrefs",
-                    "weight": 31,
+                    "weight": 30,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1371,7 +1371,7 @@
                },
                "x-appwrite": {
                    "method": "updatePrefs",
-                    "weight": 37,
+                    "weight": 36,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1440,7 +1440,7 @@
                },
                "x-appwrite": {
                    "method": "createRecovery",
-                    "weight": 39,
+                    "weight": 38,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1516,7 +1516,7 @@
                },
                "x-appwrite": {
                    "method": "updateRecovery",
-                    "weight": 40,
+                    "weight": 39,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1597,7 +1597,7 @@
                },
                "x-appwrite": {
                    "method": "listSessions",
-                    "weight": 12,
+                    "weight": 11,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1638,7 +1638,7 @@
                },
                "x-appwrite": {
                    "method": "deleteSessions",
-                    "weight": 13,
+                    "weight": 12,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1688,7 +1688,7 @@
                },
                "x-appwrite": {
                    "method": "createAnonymousSession",
-                    "weight": 18,
+                    "weight": 17,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1736,7 +1736,7 @@
                },
                "x-appwrite": {
                    "method": "createEmailPasswordSession",
-                    "weight": 17,
+                    "weight": 16,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1809,7 +1809,7 @@
                },
                "x-appwrite": {
                    "method": "updateMagicURLSession",
-                    "weight": 27,
+                    "weight": 26,
                    "cookies": false,
                    "type": "",
                    "deprecated": true,
@@ -1875,7 +1875,7 @@
                },
                "x-appwrite": {
                    "method": "createOAuth2Session",
-                    "weight": 20,
+                    "weight": 19,
                    "cookies": false,
                    "type": "webAuth",
                    "deprecated": false,
@@ -2015,7 +2015,7 @@
                },
                "x-appwrite": {
                    "method": "updatePhoneSession",
-                    "weight": 28,
+                    "weight": 27,
                    "cookies": false,
                    "type": "",
                    "deprecated": true,
@@ -2088,7 +2088,7 @@
                },
                "x-appwrite": {
                    "method": "createSession",
-                    "weight": 19,
+                    "weight": 18,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2161,7 +2161,7 @@
                },
                "x-appwrite": {
                    "method": "getSession",
-                    "weight": 14,
+                    "weight": 13,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2221,7 +2221,7 @@
                },
                "x-appwrite": {
                    "method": "updateSession",
-                    "weight": 16,
+                    "weight": 15,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2274,7 +2274,7 @@
                },
                "x-appwrite": {
                    "method": "deleteSession",
-                    "weight": 15,
+                    "weight": 14,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2336,7 +2336,7 @@
                },
                "x-appwrite": {
                    "method": "updateStatus",
-                    "weight": 38,
+                    "weight": 37,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2386,7 +2386,7 @@
                },
                "x-appwrite": {
                    "method": "createPushTarget",
-                    "weight": 55,
+                    "weight": 54,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2464,7 +2464,7 @@
                },
                "x-appwrite": {
                    "method": "updatePushTarget",
-                    "weight": 56,
+                    "weight": 55,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2534,7 +2534,7 @@
                },
                "x-appwrite": {
                    "method": "deletePushTarget",
-                    "weight": 57,
+                    "weight": 56,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2594,7 +2594,7 @@
                },
                "x-appwrite": {
                    "method": "createEmailToken",
-                    "weight": 26,
+                    "weight": 25,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2672,7 +2672,7 @@
                },
                "x-appwrite": {
                    "method": "createMagicURLToken",
-                    "weight": 25,
+                    "weight": 24,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2751,7 +2751,7 @@
                },
                "x-appwrite": {
                    "method": "createOAuth2Token",
-                    "weight": 24,
+                    "weight": 23,
                    "cookies": false,
                    "type": "webAuth",
                    "deprecated": false,
@@ -2891,7 +2891,7 @@
                },
                "x-appwrite": {
                    "method": "createPhoneToken",
-                    "weight": 29,
+                    "weight": 28,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2967,7 +2967,7 @@
                },
                "x-appwrite": {
                    "method": "createVerification",
-                    "weight": 41,
+                    "weight": 40,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -3034,7 +3034,7 @@
                },
                "x-appwrite": {
                    "method": "updateVerification",
-                    "weight": 42,
+                    "weight": 41,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -3109,7 +3109,7 @@
                },
                "x-appwrite": {
                    "method": "createPhoneVerification",
-                    "weight": 43,
+                    "weight": 42,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -3160,7 +3160,7 @@
                },
                "x-appwrite": {
                    "method": "updatePhoneVerification",
-                    "weight": 44,
+                    "weight": 43,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -3228,7 +3228,7 @@
                },
                "x-appwrite": {
                    "method": "getBrowser",
-                    "weight": 61,
+                    "weight": 60,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -3353,7 +3353,7 @@
                },
                "x-appwrite": {
                    "method": "getCreditCard",
-                    "weight": 60,
+                    "weight": 59,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -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"
@@ -3484,7 +3482,7 @@
                },
                "x-appwrite": {
                    "method": "getFavicon",
-                    "weight": 64,
+                    "weight": 63,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -3541,7 +3539,7 @@
                },
                "x-appwrite": {
                    "method": "getFlag",
-                    "weight": 62,
+                    "weight": 61,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -4028,7 +4026,7 @@
                },
                "x-appwrite": {
                    "method": "getImage",
-                    "weight": 63,
+                    "weight": 62,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -4109,7 +4107,7 @@
                },
                "x-appwrite": {
                    "method": "getInitials",
-                    "weight": 66,
+                    "weight": 65,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -4200,7 +4198,7 @@
                },
                "x-appwrite": {
                    "method": "getQR",
-                    "weight": 65,
+                    "weight": 64,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -4298,7 +4296,7 @@
                },
                "x-appwrite": {
                    "method": "listDocuments",
-                    "weight": 110,
+                    "weight": 109,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -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",
@@ -4382,7 +4380,7 @@
                },
                "x-appwrite": {
                    "method": "createDocument",
-                    "weight": 109,
+                    "weight": 108,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -4488,7 +4486,7 @@
                },
                "x-appwrite": {
                    "method": "getDocument",
-                    "weight": 111,
+                    "weight": 110,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -4582,7 +4580,7 @@
                },
                "x-appwrite": {
                    "method": "updateDocument",
-                    "weight": 113,
+                    "weight": 112,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -4680,7 +4678,7 @@
                },
                "x-appwrite": {
                    "method": "deleteDocument",
-                    "weight": 114,
+                    "weight": 113,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -4748,7 +4746,7 @@
                "tags": [
                    "functions"
                ],
-                "description": "",
+                "description": "Get a list of all the current user function execution logs. You can use the query params to filter your results.",
                "responses": {
                    "200": {
                        "description": "Executions List",
@@ -4763,12 +4761,12 @@
                },
                "x-appwrite": {
                    "method": "listExecutions",
-                    "weight": 383,
+                    "weight": 306,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
                    "demo": "functions\/list-executions.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/masterGet a list of all the current user function execution logs. You can use the query params to filter your results.",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/functions\/list-executions.md",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -4813,6 +4811,17 @@
                            "default": []
                        },
                        "in": "query"
+                    },
+                    {
+                        "name": "search",
+                        "description": "Search term to filter your list results. Max length: 256 chars.",
+                        "required": false,
+                        "schema": {
+                            "type": "string",
+                            "x-example": "<SEARCH>",
+                            "default": ""
+                        },
+                        "in": "query"
                    }
                ]
            },
@@ -4822,7 +4831,7 @@
                "tags": [
                    "functions"
                ],
-                "description": "",
+                "description": "Trigger a function execution. The returned object will return you the current execution status. You can ping the `Get Execution` endpoint to get updates on the current execution status. Once this endpoint is called, your function execution process will start asynchronously.",
                "responses": {
                    "201": {
                        "description": "Execution",
@@ -4837,12 +4846,12 @@
                },
                "x-appwrite": {
                    "method": "createExecution",
-                    "weight": 381,
+                    "weight": 305,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
                    "demo": "functions\/create-execution.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/masterTrigger a function execution. The returned object will return you the current execution status. You can ping the `Get Execution` endpoint to get updates on the current execution status. Once this endpoint is called, your function execution process will start asynchronously.",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/functions\/create-execution.md",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -4936,7 +4945,7 @@
                "tags": [
                    "functions"
                ],
-                "description": "",
+                "description": "Get a function execution log by its unique ID.",
                "responses": {
                    "200": {
                        "description": "Execution",
@@ -4951,12 +4960,12 @@
                },
                "x-appwrite": {
                    "method": "getExecution",
-                    "weight": 382,
+                    "weight": 307,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
                    "demo": "functions\/get-execution.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/masterGet a function execution log by its unique ID.",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/functions\/get-execution.md",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -5024,7 +5033,7 @@
                },
                "x-appwrite": {
                    "method": "query",
-                    "weight": 303,
+                    "weight": 331,
                    "cookies": false,
                    "type": "graphql",
                    "deprecated": false,
@@ -5075,7 +5084,7 @@
                },
                "x-appwrite": {
                    "method": "mutation",
-                    "weight": 302,
+                    "weight": 330,
                    "cookies": false,
                    "type": "graphql",
                    "deprecated": false,
@@ -5126,7 +5135,7 @@
                },
                "x-appwrite": {
                    "method": "get",
-                    "weight": 118,
+                    "weight": 117,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5177,7 +5186,7 @@
                },
                "x-appwrite": {
                    "method": "listCodes",
-                    "weight": 119,
+                    "weight": 118,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5228,7 +5237,7 @@
                },
                "x-appwrite": {
                    "method": "listContinents",
-                    "weight": 123,
+                    "weight": 122,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5279,7 +5288,7 @@
                },
                "x-appwrite": {
                    "method": "listCountries",
-                    "weight": 120,
+                    "weight": 119,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5330,7 +5339,7 @@
                },
                "x-appwrite": {
                    "method": "listCountriesEU",
-                    "weight": 121,
+                    "weight": 120,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5381,7 +5390,7 @@
                },
                "x-appwrite": {
                    "method": "listCountriesPhones",
-                    "weight": 122,
+                    "weight": 121,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5432,7 +5441,7 @@
                },
                "x-appwrite": {
                    "method": "listCurrencies",
-                    "weight": 124,
+                    "weight": 123,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5483,7 +5492,7 @@
                },
                "x-appwrite": {
                    "method": "listLanguages",
-                    "weight": 125,
+                    "weight": 124,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5534,7 +5543,7 @@
                },
                "x-appwrite": {
                    "method": "createSubscriber",
-                    "weight": 348,
+                    "weight": 376,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5616,7 +5625,7 @@
                },
                "x-appwrite": {
                    "method": "deleteSubscriber",
-                    "weight": 352,
+                    "weight": 380,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5690,7 +5699,7 @@
                },
                "x-appwrite": {
                    "method": "listFiles",
-                    "weight": 209,
+                    "weight": 208,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5775,7 +5784,7 @@
                },
                "x-appwrite": {
                    "method": "createFile",
-                    "weight": 208,
+                    "weight": 207,
                    "cookies": false,
                    "type": "upload",
                    "deprecated": false,
@@ -5872,7 +5881,7 @@
                },
                "x-appwrite": {
                    "method": "getFile",
-                    "weight": 210,
+                    "weight": 209,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5943,7 +5952,7 @@
                },
                "x-appwrite": {
                    "method": "updateFile",
-                    "weight": 215,
+                    "weight": 214,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6031,7 +6040,7 @@
                },
                "x-appwrite": {
                    "method": "deleteFile",
-                    "weight": 216,
+                    "weight": 215,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6097,7 +6106,7 @@
                },
                "x-appwrite": {
                    "method": "getFileDownload",
-                    "weight": 212,
+                    "weight": 211,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -6163,7 +6172,7 @@
                },
                "x-appwrite": {
                    "method": "getFilePreview",
-                    "weight": 211,
+                    "weight": 210,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -6379,7 +6388,7 @@
                },
                "x-appwrite": {
                    "method": "getFileView",
-                    "weight": 213,
+                    "weight": 212,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -6452,7 +6461,7 @@
                },
                "x-appwrite": {
                    "method": "list",
-                    "weight": 220,
+                    "weight": 219,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6527,7 +6536,7 @@
                },
                "x-appwrite": {
                    "method": "create",
-                    "weight": 219,
+                    "weight": 218,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6611,7 +6620,7 @@
                },
                "x-appwrite": {
                    "method": "get",
-                    "weight": 221,
+                    "weight": 220,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6672,7 +6681,7 @@
                },
                "x-appwrite": {
                    "method": "updateName",
-                    "weight": 223,
+                    "weight": 222,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6745,7 +6754,7 @@
                },
                "x-appwrite": {
                    "method": "delete",
-                    "weight": 225,
+                    "weight": 224,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6808,7 +6817,7 @@
                },
                "x-appwrite": {
                    "method": "listMemberships",
-                    "weight": 227,
+                    "weight": 226,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6893,7 +6902,7 @@
                },
                "x-appwrite": {
                    "method": "createMembership",
-                    "weight": 226,
+                    "weight": 225,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7003,7 +7012,7 @@
                },
                "x-appwrite": {
                    "method": "getMembership",
-                    "weight": 228,
+                    "weight": 227,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7074,7 +7083,7 @@
                },
                "x-appwrite": {
                    "method": "updateMembership",
-                    "weight": 229,
+                    "weight": 228,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7160,7 +7169,7 @@
                },
                "x-appwrite": {
                    "method": "deleteMembership",
-                    "weight": 231,
+                    "weight": 230,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7233,7 +7242,7 @@
                },
                "x-appwrite": {
                    "method": "updateMembershipStatus",
-                    "weight": 230,
+                    "weight": 229,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7330,7 +7339,7 @@
                },
                "x-appwrite": {
                    "method": "getPrefs",
-                    "weight": 222,
+                    "weight": 221,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7390,7 +7399,7 @@
                },
                "x-appwrite": {
                    "method": "updatePrefs",
-                    "weight": 224,
+                    "weight": 223,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7503,11 +7512,6 @@
            "description": "The Users service allows you to manage your project users.",
            "x-globalAttributes": []
        },
-        {
-            "name": "sites",
-            "description": "The Sites Service allows you view, create and manage your web applications.",
-            "x-globalAttributes": []
-        },
        {
            "name": "functions",
            "description": "The Functions Service allows you view, create and manage your Cloud Functions.",
@@ -9137,7 +9141,7 @@
                    },
                    "duration": {
                        "type": "number",
-                        "description": "Resource(function\/site) execution duration in seconds.",
+                        "description": "Function 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.7.0",
+        "version": "1.6.1",
        "title": "Appwrite",
        "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
        "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -87,7 +87,7 @@
                },
                "x-appwrite": {
                    "method": "get",
-                    "weight": 10,
+                    "weight": 9,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -137,7 +137,7 @@
                },
                "x-appwrite": {
                    "method": "create",
-                    "weight": 9,
+                    "weight": 8,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -227,7 +227,7 @@
                },
                "x-appwrite": {
                    "method": "updateEmail",
-                    "weight": 35,
+                    "weight": 34,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -306,7 +306,7 @@
                },
                "x-appwrite": {
                    "method": "listIdentities",
-                    "weight": 58,
+                    "weight": 57,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -367,7 +367,7 @@
                },
                "x-appwrite": {
                    "method": "deleteIdentity",
-                    "weight": 59,
+                    "weight": 58,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -429,7 +429,7 @@
                },
                "x-appwrite": {
                    "method": "createJWT",
-                    "weight": 30,
+                    "weight": 29,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -479,7 +479,7 @@
                },
                "x-appwrite": {
                    "method": "listLogs",
-                    "weight": 32,
+                    "weight": 31,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -545,7 +545,7 @@
                },
                "x-appwrite": {
                    "method": "updateMFA",
-                    "weight": 45,
+                    "weight": 44,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -617,7 +617,7 @@
                },
                "x-appwrite": {
                    "method": "createMfaAuthenticator",
-                    "weight": 47,
+                    "weight": 46,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -682,7 +682,7 @@
                },
                "x-appwrite": {
                    "method": "updateMfaAuthenticator",
-                    "weight": 48,
+                    "weight": 47,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -760,7 +760,7 @@
                },
                "x-appwrite": {
                    "method": "deleteMfaAuthenticator",
-                    "weight": 52,
+                    "weight": 51,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -827,7 +827,7 @@
                },
                "x-appwrite": {
                    "method": "createMfaChallenge",
-                    "weight": 53,
+                    "weight": 52,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -903,7 +903,7 @@
                },
                "x-appwrite": {
                    "method": "updateMfaChallenge",
-                    "weight": 54,
+                    "weight": 53,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -982,7 +982,7 @@
                },
                "x-appwrite": {
                    "method": "listMfaFactors",
-                    "weight": 46,
+                    "weight": 45,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1034,7 +1034,7 @@
                },
                "x-appwrite": {
                    "method": "getMfaRecoveryCodes",
-                    "weight": 51,
+                    "weight": 50,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1084,7 +1084,7 @@
                },
                "x-appwrite": {
                    "method": "createMfaRecoveryCodes",
-                    "weight": 49,
+                    "weight": 48,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1134,7 +1134,7 @@
                },
                "x-appwrite": {
                    "method": "updateMfaRecoveryCodes",
-                    "weight": 50,
+                    "weight": 49,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1186,7 +1186,7 @@
                },
                "x-appwrite": {
                    "method": "updateName",
-                    "weight": 33,
+                    "weight": 32,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1258,7 +1258,7 @@
                },
                "x-appwrite": {
                    "method": "updatePassword",
-                    "weight": 34,
+                    "weight": 33,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1336,7 +1336,7 @@
                },
                "x-appwrite": {
                    "method": "updatePhone",
-                    "weight": 36,
+                    "weight": 35,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1415,7 +1415,7 @@
                },
                "x-appwrite": {
                    "method": "getPrefs",
-                    "weight": 31,
+                    "weight": 30,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1465,7 +1465,7 @@
                },
                "x-appwrite": {
                    "method": "updatePrefs",
-                    "weight": 37,
+                    "weight": 36,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1537,7 +1537,7 @@
                },
                "x-appwrite": {
                    "method": "createRecovery",
-                    "weight": 39,
+                    "weight": 38,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1617,7 +1617,7 @@
                },
                "x-appwrite": {
                    "method": "updateRecovery",
-                    "weight": 40,
+                    "weight": 39,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1703,7 +1703,7 @@
                },
                "x-appwrite": {
                    "method": "listSessions",
-                    "weight": 12,
+                    "weight": 11,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1748,7 +1748,7 @@
                },
                "x-appwrite": {
                    "method": "deleteSessions",
-                    "weight": 13,
+                    "weight": 12,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1800,7 +1800,7 @@
                },
                "x-appwrite": {
                    "method": "createAnonymousSession",
-                    "weight": 18,
+                    "weight": 17,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1850,7 +1850,7 @@
                },
                "x-appwrite": {
                    "method": "createEmailPasswordSession",
-                    "weight": 17,
+                    "weight": 16,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -1927,7 +1927,7 @@
                },
                "x-appwrite": {
                    "method": "updateMagicURLSession",
-                    "weight": 27,
+                    "weight": 26,
                    "cookies": false,
                    "type": "",
                    "deprecated": true,
@@ -2001,7 +2001,7 @@
                },
                "x-appwrite": {
                    "method": "createOAuth2Session",
-                    "weight": 20,
+                    "weight": 19,
                    "cookies": false,
                    "type": "webAuth",
                    "deprecated": false,
@@ -2136,7 +2136,7 @@
                },
                "x-appwrite": {
                    "method": "updatePhoneSession",
-                    "weight": 28,
+                    "weight": 27,
                    "cookies": false,
                    "type": "",
                    "deprecated": true,
@@ -2213,7 +2213,7 @@
                },
                "x-appwrite": {
                    "method": "createSession",
-                    "weight": 19,
+                    "weight": 18,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2290,7 +2290,7 @@
                },
                "x-appwrite": {
                    "method": "getSession",
-                    "weight": 14,
+                    "weight": 13,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2350,7 +2350,7 @@
                },
                "x-appwrite": {
                    "method": "updateSession",
-                    "weight": 16,
+                    "weight": 15,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2405,7 +2405,7 @@
                },
                "x-appwrite": {
                    "method": "deleteSession",
-                    "weight": 15,
+                    "weight": 14,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2467,7 +2467,7 @@
                },
                "x-appwrite": {
                    "method": "updateStatus",
-                    "weight": 38,
+                    "weight": 37,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2519,7 +2519,7 @@
                },
                "x-appwrite": {
                    "method": "createPushTarget",
-                    "weight": 55,
+                    "weight": 54,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2602,7 +2602,7 @@
                },
                "x-appwrite": {
                    "method": "updatePushTarget",
-                    "weight": 56,
+                    "weight": 55,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2673,7 +2673,7 @@
                },
                "x-appwrite": {
                    "method": "deletePushTarget",
-                    "weight": 57,
+                    "weight": 56,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2733,7 +2733,7 @@
                },
                "x-appwrite": {
                    "method": "createEmailToken",
-                    "weight": 26,
+                    "weight": 25,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2816,7 +2816,7 @@
                },
                "x-appwrite": {
                    "method": "createMagicURLToken",
-                    "weight": 25,
+                    "weight": 24,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -2905,7 +2905,7 @@
                },
                "x-appwrite": {
                    "method": "createOAuth2Token",
-                    "weight": 24,
+                    "weight": 23,
                    "cookies": false,
                    "type": "webAuth",
                    "deprecated": false,
@@ -3040,7 +3040,7 @@
                },
                "x-appwrite": {
                    "method": "createPhoneToken",
-                    "weight": 29,
+                    "weight": 28,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -3120,7 +3120,7 @@
                },
                "x-appwrite": {
                    "method": "createVerification",
-                    "weight": 41,
+                    "weight": 40,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -3190,7 +3190,7 @@
                },
                "x-appwrite": {
                    "method": "updateVerification",
-                    "weight": 42,
+                    "weight": 41,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -3269,7 +3269,7 @@
                },
                "x-appwrite": {
                    "method": "createPhoneVerification",
-                    "weight": 43,
+                    "weight": 42,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -3322,7 +3322,7 @@
                },
                "x-appwrite": {
                    "method": "updatePhoneVerification",
-                    "weight": 44,
+                    "weight": 43,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -3401,7 +3401,7 @@
                },
                "x-appwrite": {
                    "method": "getBrowser",
-                    "weight": 61,
+                    "weight": 60,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -3527,7 +3527,7 @@
                },
                "x-appwrite": {
                    "method": "getCreditCard",
-                    "weight": 60,
+                    "weight": 59,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -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"
                    },
@@ -3659,7 +3657,7 @@
                },
                "x-appwrite": {
                    "method": "getFavicon",
-                    "weight": 64,
+                    "weight": 63,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -3723,7 +3721,7 @@
                },
                "x-appwrite": {
                    "method": "getFlag",
-                    "weight": 62,
+                    "weight": 61,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -4211,7 +4209,7 @@
                },
                "x-appwrite": {
                    "method": "getImage",
-                    "weight": 63,
+                    "weight": 62,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -4295,7 +4293,7 @@
                },
                "x-appwrite": {
                    "method": "getInitials",
-                    "weight": 66,
+                    "weight": 65,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -4387,7 +4385,7 @@
                },
                "x-appwrite": {
                    "method": "getQR",
-                    "weight": 65,
+                    "weight": 64,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -4479,7 +4477,7 @@
                },
                "x-appwrite": {
                    "method": "listDocuments",
-                    "weight": 110,
+                    "weight": 109,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -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",
@@ -4560,7 +4558,7 @@
                },
                "x-appwrite": {
                    "method": "createDocument",
-                    "weight": 109,
+                    "weight": 108,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -4665,7 +4663,7 @@
                },
                "x-appwrite": {
                    "method": "getDocument",
-                    "weight": 111,
+                    "weight": 110,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -4754,7 +4752,7 @@
                },
                "x-appwrite": {
                    "method": "updateDocument",
-                    "weight": 113,
+                    "weight": 112,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -4850,7 +4848,7 @@
                },
                "x-appwrite": {
                    "method": "deleteDocument",
-                    "weight": 114,
+                    "weight": 113,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -4918,7 +4916,7 @@
                "tags": [
                    "functions"
                ],
-                "description": "",
+                "description": "Get a list of all the current user function execution logs. You can use the query params to filter your results.",
                "responses": {
                    "200": {
                        "description": "Executions List",
@@ -4929,12 +4927,12 @@
                },
                "x-appwrite": {
                    "method": "listExecutions",
-                    "weight": 383,
+                    "weight": 306,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
                    "demo": "functions\/list-executions.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/masterGet a list of all the current user function execution logs. You can use the query params to filter your results.",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/functions\/list-executions.md",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -4976,6 +4974,15 @@
                        },
                        "default": [],
                        "in": "query"
+                    },
+                    {
+                        "name": "search",
+                        "description": "Search term to filter your list results. Max length: 256 chars.",
+                        "required": false,
+                        "type": "string",
+                        "x-example": "<SEARCH>",
+                        "default": "",
+                        "in": "query"
                    }
                ]
            },
@@ -4991,7 +4998,7 @@
                "tags": [
                    "functions"
                ],
-                "description": "",
+                "description": "Trigger a function execution. The returned object will return you the current execution status. You can ping the `Get Execution` endpoint to get updates on the current execution status. Once this endpoint is called, your function execution process will start asynchronously.",
                "responses": {
                    "201": {
                        "description": "Execution",
@@ -5002,12 +5009,12 @@
                },
                "x-appwrite": {
                    "method": "createExecution",
-                    "weight": 381,
+                    "weight": 305,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
                    "demo": "functions\/create-execution.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/masterTrigger a function execution. The returned object will return you the current execution status. You can ping the `Get Execution` endpoint to get updates on the current execution status. Once this endpoint is called, your function execution process will start asynchronously.",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/functions\/create-execution.md",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -5109,7 +5116,7 @@
                "tags": [
                    "functions"
                ],
-                "description": "",
+                "description": "Get a function execution log by its unique ID.",
                "responses": {
                    "200": {
                        "description": "Execution",
@@ -5120,12 +5127,12 @@
                },
                "x-appwrite": {
                    "method": "getExecution",
-                    "weight": 382,
+                    "weight": 307,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
                    "demo": "functions\/get-execution.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/masterGet a function execution log by its unique ID.",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/functions\/get-execution.md",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -5191,7 +5198,7 @@
                },
                "x-appwrite": {
                    "method": "query",
-                    "weight": 303,
+                    "weight": 331,
                    "cookies": false,
                    "type": "graphql",
                    "deprecated": false,
@@ -5264,7 +5271,7 @@
                },
                "x-appwrite": {
                    "method": "mutation",
-                    "weight": 302,
+                    "weight": 330,
                    "cookies": false,
                    "type": "graphql",
                    "deprecated": false,
@@ -5337,7 +5344,7 @@
                },
                "x-appwrite": {
                    "method": "get",
-                    "weight": 118,
+                    "weight": 117,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5390,7 +5397,7 @@
                },
                "x-appwrite": {
                    "method": "listCodes",
-                    "weight": 119,
+                    "weight": 118,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5443,7 +5450,7 @@
                },
                "x-appwrite": {
                    "method": "listContinents",
-                    "weight": 123,
+                    "weight": 122,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5496,7 +5503,7 @@
                },
                "x-appwrite": {
                    "method": "listCountries",
-                    "weight": 120,
+                    "weight": 119,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5549,7 +5556,7 @@
                },
                "x-appwrite": {
                    "method": "listCountriesEU",
-                    "weight": 121,
+                    "weight": 120,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5602,7 +5609,7 @@
                },
                "x-appwrite": {
                    "method": "listCountriesPhones",
-                    "weight": 122,
+                    "weight": 121,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5655,7 +5662,7 @@
                },
                "x-appwrite": {
                    "method": "listCurrencies",
-                    "weight": 124,
+                    "weight": 123,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5708,7 +5715,7 @@
                },
                "x-appwrite": {
                    "method": "listLanguages",
-                    "weight": 125,
+                    "weight": 124,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5761,7 +5768,7 @@
                },
                "x-appwrite": {
                    "method": "createSubscriber",
-                    "weight": 348,
+                    "weight": 376,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5845,7 +5852,7 @@
                },
                "x-appwrite": {
                    "method": "deleteSubscriber",
-                    "weight": 352,
+                    "weight": 380,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5917,7 +5924,7 @@
                },
                "x-appwrite": {
                    "method": "listFiles",
-                    "weight": 209,
+                    "weight": 208,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5999,7 +6006,7 @@
                },
                "x-appwrite": {
                    "method": "createFile",
-                    "weight": 208,
+                    "weight": 207,
                    "cookies": false,
                    "type": "upload",
                    "deprecated": false,
@@ -6090,7 +6097,7 @@
                },
                "x-appwrite": {
                    "method": "getFile",
-                    "weight": 210,
+                    "weight": 209,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6159,7 +6166,7 @@
                },
                "x-appwrite": {
                    "method": "updateFile",
-                    "weight": 215,
+                    "weight": 214,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6247,7 +6254,7 @@
                },
                "x-appwrite": {
                    "method": "deleteFile",
-                    "weight": 216,
+                    "weight": 215,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6318,7 +6325,7 @@
                },
                "x-appwrite": {
                    "method": "getFileDownload",
-                    "weight": 212,
+                    "weight": 211,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -6389,7 +6396,7 @@
                },
                "x-appwrite": {
                    "method": "getFilePreview",
-                    "weight": 211,
+                    "weight": 210,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -6588,7 +6595,7 @@
                },
                "x-appwrite": {
                    "method": "getFileView",
-                    "weight": 213,
+                    "weight": 212,
                    "cookies": false,
                    "type": "location",
                    "deprecated": false,
@@ -6659,7 +6666,7 @@
                },
                "x-appwrite": {
                    "method": "list",
-                    "weight": 220,
+                    "weight": 219,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6733,7 +6740,7 @@
                },
                "x-appwrite": {
                    "method": "create",
-                    "weight": 219,
+                    "weight": 218,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6824,7 +6831,7 @@
                },
                "x-appwrite": {
                    "method": "get",
-                    "weight": 221,
+                    "weight": 220,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6885,7 +6892,7 @@
                },
                "x-appwrite": {
                    "method": "updateName",
-                    "weight": 223,
+                    "weight": 222,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -6959,7 +6966,7 @@
                },
                "x-appwrite": {
                    "method": "delete",
-                    "weight": 225,
+                    "weight": 224,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7022,7 +7029,7 @@
                },
                "x-appwrite": {
                    "method": "listMemberships",
-                    "weight": 227,
+                    "weight": 226,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7104,7 +7111,7 @@
                },
                "x-appwrite": {
                    "method": "createMembership",
-                    "weight": 226,
+                    "weight": 225,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7218,7 +7225,7 @@
                },
                "x-appwrite": {
                    "method": "getMembership",
-                    "weight": 228,
+                    "weight": 227,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7287,7 +7294,7 @@
                },
                "x-appwrite": {
                    "method": "updateMembership",
-                    "weight": 229,
+                    "weight": 228,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7372,7 +7379,7 @@
                },
                "x-appwrite": {
                    "method": "deleteMembership",
-                    "weight": 231,
+                    "weight": 230,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7443,7 +7450,7 @@
                },
                "x-appwrite": {
                    "method": "updateMembershipStatus",
-                    "weight": 230,
+                    "weight": 229,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7538,7 +7545,7 @@
                },
                "x-appwrite": {
                    "method": "getPrefs",
-                    "weight": 222,
+                    "weight": 221,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7598,7 +7605,7 @@
                },
                "x-appwrite": {
                    "method": "updatePrefs",
-                    "weight": 224,
+                    "weight": 223,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -7708,11 +7715,6 @@
            "description": "The Users service allows you to manage your project users.",
            "x-globalAttributes": []
        },
-        {
-            "name": "sites",
-            "description": "The Sites Service allows you view, create and manage your web applications.",
-            "x-globalAttributes": []
-        },
        {
            "name": "functions",
            "description": "The Functions Service allows you view, create and manage your Cloud Functions.",
@@ -9328,7 +9330,7 @@
                },
                "duration": {
                    "type": "number",
-                    "description": "Resource(function\/site) execution duration in seconds.",
+                    "description": "Function execution duration in seconds.",
                    "x-example": 0.4,
                    "format": "double"
                },
@@ -7,5 +7,4 @@ return [
    "gif" => "image/gif",
    "png" => "image/png",
    "heic" => "image/heic",
-    "webp" => "image/webp",
 ];
@@ -1,40 +0,0 @@
-<?php
-
-return [
-    'NODE' => [
-        'name' => 'node',
-        'versions' => ['22', '21.0', '20.0', '19.0', '18.0', '16.0', '14.5']
-    ],
-    'PYTHON' => [
-        'name' => 'python',
-        'versions' => ['3.12', '3.11', '3.10', '3.9', '3.8']
-    ],
-    'DART' => [
-        'name' => 'dart',
-        'versions' => ['3.5', '3.3', '3.1', '3.0', '2.19', '2.18', '2.17', '2.16']
-    ],
-    'GO' => [
-        'name' => 'go',
-        'versions' => ['1.23']
-    ],
-    'PHP' => [
-        'name' => 'php',
-        'versions' => ['8.3', '8.2', '8.1', '8.0']
-    ],
-    'DENO' => [
-        'name' => 'deno',
-        'versions' => ['2.0', '1.46', '1.40', '1.35', '1.24', '1.21']
-    ],
-    'BUN' => [
-        'name' => 'bun',
-        'versions' => ['1.1', '1.0']
-    ],
-    'RUBY' => [
-        'name' => 'ruby',
-        'versions' => ['3.3', '3.2', '3.1', '3.0']
-    ],
-    'FLUTTER' => [
-        'name' => 'flutter',
-        'versions' => ['3.24']
-    ],
-];
@@ -1,753 +0,0 @@
-<?php
-
-use Utopia\System\System;
-
-/**
- * List of Appwrite Sites templates
- */
-
-$protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
-$hostname = System::getEnv('_APP_DOMAIN');
-
-// TODO: Development override
-if (System::getEnv('_APP_ENV') === 'development') {
-    $hostname = 'localhost';
-}
-
-$url = $protocol . '://' . $hostname;
-
-const TEMPLATE_FRAMEWORKS = [
-    'SVELTEKIT' => [
-        'key' => 'sveltekit',
-        'name' => 'SvelteKit',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'outputDirectory' => './build',
-        'buildRuntime' => 'node-22',
-        'adapter' => 'ssr',
-        'fallbackFile' => '',
-    ],
-    'NEXTJS' => [
-        'key' => 'nextjs',
-        'name' => 'Next.js',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'outputDirectory' => './.next',
-        'buildRuntime' => 'node-22',
-        'adapter' => 'ssr',
-        'fallbackFile' => '',
-    ],
-    'NUXT' => [
-        'key' => 'nuxt',
-        'name' => 'Nuxt',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'outputDirectory' => './.output',
-        'buildRuntime' => 'node-22',
-        'adapter' => 'ssr',
-        'fallbackFile' => '',
-    ],
-    'REMIX' => [
-        'key' => 'remix',
-        'name' => 'Remix',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'outputDirectory' => './build',
-        'buildRuntime' => 'node-22',
-        'adapter' => 'ssr',
-        'fallbackFile' => '',
-    ],
-    'ASTRO' => [
-        'key' => 'astro',
-        'name' => 'Astro',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'outputDirectory' => './dist',
-        'buildRuntime' => 'node-22',
-        'adapter' => 'ssr',
-        'fallbackFile' => '',
-    ],
-    'FLUTTER' => [
-        'key' => 'flutter',
-        'name' => 'Flutter',
-        'installCommand' => '',
-        'buildCommand' => 'flutter build web',
-        'outputDirectory' => './build/web',
-        'buildRuntime' => 'flutter-3.29',
-        'adapter' => 'static',
-        'fallbackFile' => '',
-    ],
-    'OTHER' => [
-        'key' => 'other',
-        'name' => 'Other',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'buildRuntime' => 'node-22',
-        'adapter' => 'static',
-        'fallbackFile' => 'index.html',
-    ],
-    'VITE' => [
-        'key' => 'vite',
-        'name' => 'Vite',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'buildRuntime' => 'node-22',
-        'adapter' => 'static',
-        'outputDirectory' => './dist',
-    ],
-    'REACT' => [
-        'key' => 'react',
-        'name' => 'React',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'buildRuntime' => 'node-22',
-        'adapter' => 'static',
-        'outputDirectory' => './dist',
-        'fallbackFile' => 'index.html',
-    ],
-    'ANGULAR' => [
-        'key' => 'angular',
-        'name' => 'Angular',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'buildRuntime' => 'node-22',
-        'adapter' => 'static',
-        'outputDirectory' => './dist/angular/browser',
-        'fallbackFile' => 'index.html',
-    ],
-    'VUE' => [
-        'key' => 'vue',
-        'name' => 'Vue.js',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'buildRuntime' => 'node-22',
-        'adapter' => 'static',
-        'outputDirectory' => './dist',
-        'fallbackFile' => 'index.html',
-    ],
-];
-
-function getFramework(string $frameworkEnum, array $overrides)
-{
-    $settings = \array_merge(TEMPLATE_FRAMEWORKS[$frameworkEnum], $overrides);
-    return $settings;
-}
-
-return [
-    [
-        'key' => 'template-for-onelink',
-        'name' => 'Onelink template',
-        'useCases' => ['starter'],
-        'screenshotDark' => $url . '/images/sites/templates/template-for-onelink-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/template-for-onelink-light.png',
-        'frameworks' => [
-            getFramework('NUXT', [
-                'providerRootDirectory' => './onelink',
-                'buildCommand' => 'npm run generate',
-                'outputDirectory' => './dist',
-                'adapter' => 'static',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'templates-for-sites',
-        'providerOwner' => 'Meldiron',
-        'providerVersion' => '0.1.*',
-        'variables' => []
-    ],
-    [
-        'key' => 'starter-for-flutter',
-        'name' => 'Flutter starter',
-        'useCases' => ['starter'],
-        'screenshotDark' => $url . '/images/sites/templates/starter-for-flutter-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/starter-for-flutter-light.png',
-        'frameworks' => [
-            getFramework('FLUTTER', [
-                'providerRootDirectory' => './',
-                'buildCommand' => 'sh build.sh',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'starter-for-flutter',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => [
-            [
-                'name' => 'APPWRITE_PUBLIC_ENDPOINT',
-                'description' => 'Endpoint of Appwrite server',
-                'value' => '{apiEndpoint}',
-                'placeholder' => '{apiEndpoint}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'APPWRITE_PROJECT_ID',
-                'description' => 'Your Appwrite project ID',
-                'value' => '{projectId}',
-                'placeholder' => '{projectId}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'APPWRITE_PROJECT_NAME',
-                'description' => 'Your Appwrite project name',
-                'value' => '{projectName}',
-                'placeholder' => '{projectName}',
-                'required' => true,
-                'type' => 'text'
-            ],
-        ]
-    ],
-    [
-        'key' => 'starter-for-js',
-        'name' => 'JavaScript starter',
-        'useCases' => ['starter'],
-        'screenshotDark' => $url . '/images/sites/templates/starter-for-js-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/starter-for-js-light.png',
-        'frameworks' => [
-            getFramework('VITE', [
-                'providerRootDirectory' => './',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'starter-for-js',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => [
-            [
-                'name' => 'VITE_APPWRITE_ENDPOINT',
-                'description' => 'Endpoint of Appwrite server',
-                'value' => '{apiEndpoint}',
-                'placeholder' => '{apiEndpoint}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'VITE_APPWRITE_PROJECT_ID',
-                'description' => 'Your Appwrite project ID',
-                'value' => '{projectId}',
-                'placeholder' => '{projectId}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'VITE_APPWRITE_PROJECT_NAME',
-                'description' => 'Your Appwrite project name',
-                'value' => '{projectName}',
-                'placeholder' => '{projectName}',
-                'required' => true,
-                'type' => 'text'
-            ],
-        ]
-    ],
-    [
-        'key' => 'starter-for-angular',
-        'name' => 'Angular starter',
-        'useCases' => ['starter'],
-        'screenshotDark' => $url . '/images/sites/templates/starter-for-angular-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/starter-for-angular-light.png',
-        'frameworks' => [
-            getFramework('ANGULAR', [
-                'providerRootDirectory' => './',
-                'outputDirectory' => './dist/angular-starter-kit-for-appwrite/browser',
-                'buildCommand' => 'sh prepare-env.sh && npm run build'
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'starter-for-angular',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => [
-            [
-                'name' => 'APPWRITE_ENDPOINT',
-                'description' => 'Endpoint of Appwrite server',
-                'value' => '{apiEndpoint}',
-                'placeholder' => '{apiEndpoint}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'APPWRITE_PROJECT_ID',
-                'description' => 'Your Appwrite project ID',
-                'value' => '{projectId}',
-                'placeholder' => '{projectId}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'APPWRITE_PROJECT_NAME',
-                'description' => 'Your Appwrite project name',
-                'value' => '{projectName}',
-                'placeholder' => '{projectName}',
-                'required' => true,
-                'type' => 'text'
-            ],
-        ]
-    ],
-    [
-        'key' => 'starter-for-svelte',
-        'name' => 'Svelte starter',
-        'useCases' => ['starter'],
-        'screenshotDark' => $url . '/images/sites/templates/starter-for-svelte-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/starter-for-svelte-light.png',
-        'frameworks' => [
-            getFramework('SVELTEKIT', [
-                'providerRootDirectory' => './',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'starter-for-svelte',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => [
-            [
-                'name' => 'PUBLIC_APPWRITE_ENDPOINT',
-                'description' => 'Endpoint of Appwrite server',
-                'value' => '{apiEndpoint}',
-                'placeholder' => '{apiEndpoint}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'PUBLIC_APPWRITE_PROJECT_ID',
-                'description' => 'Your Appwrite project ID',
-                'value' => '{projectId}',
-                'placeholder' => '{projectId}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'PUBLIC_APPWRITE_PROJECT_NAME',
-                'description' => 'Your Appwrite project name',
-                'value' => '{projectName}',
-                'placeholder' => '{projectName}',
-                'required' => true,
-                'type' => 'text'
-            ],
-        ]
-    ],
-    [
-        'key' => 'starter-for-react',
-        'name' => 'React starter',
-        'useCases' => ['starter'],
-        'screenshotDark' => $url . '/images/sites/templates/starter-for-react-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/starter-for-react-light.png',
-        'frameworks' => [
-            getFramework('REACT', [
-                'providerRootDirectory' => './',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'starter-for-react',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => [
-            [
-                'name' => 'VITE_APPWRITE_ENDPOINT',
-                'description' => 'Endpoint of Appwrite server',
-                'value' => '{apiEndpoint}',
-                'placeholder' => '{apiEndpoint}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'VITE_APPWRITE_PROJECT_ID',
-                'description' => 'Your Appwrite project ID',
-                'value' => '{projectId}',
-                'placeholder' => '{projectId}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'VITE_APPWRITE_PROJECT_NAME',
-                'description' => 'Your Appwrite project name',
-                'value' => '{projectName}',
-                'placeholder' => '{projectName}',
-                'required' => true,
-                'type' => 'text'
-            ],
-        ]
-    ],
-    [
-        'key' => 'starter-for-vue',
-        'name' => 'Vue starter',
-        'useCases' => ['starter'],
-        'screenshotDark' => $url . '/images/sites/templates/starter-for-vue-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/starter-for-vue-light.png',
-        'frameworks' => [
-            getFramework('VUE', [
-                'providerRootDirectory' => './',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'starter-for-vue',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => [
-            [
-                'name' => 'VITE_APPWRITE_ENDPOINT',
-                'description' => 'Endpoint of Appwrite server',
-                'value' => '{apiEndpoint}',
-                'placeholder' => '{apiEndpoint}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'VITE_APPWRITE_PROJECT_ID',
-                'description' => 'Your Appwrite project ID',
-                'value' => '{projectId}',
-                'placeholder' => '{projectId}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'VITE_APPWRITE_PROJECT_NAME',
-                'description' => 'Your Appwrite project name',
-                'value' => '{projectName}',
-                'placeholder' => '{projectName}',
-                'required' => true,
-                'type' => 'text'
-            ],
-        ]
-    ],
-    [
-        'key' => 'starter-for-react-native',
-        'name' => 'React Native starter',
-        'useCases' => ['starter'],
-        'screenshotDark' => $url . '/images/sites/templates/starter-for-react-native-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/starter-for-react-native-light.png',
-        'frameworks' => [
-            getFramework('REACT', [
-                'providerRootDirectory' => './',
-                'fallbackFile' => '+not-found.html',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'starter-for-react-native',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => [
-            [
-                'name' => 'EXPO_PUBLIC_APPWRITE_ENDPOINT',
-                'description' => 'Endpoint of Appwrite server',
-                'value' => '{apiEndpoint}',
-                'placeholder' => '{apiEndpoint}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'EXPO_PUBLIC_APPWRITE_PROJECT_ID',
-                'description' => 'Your Appwrite project ID',
-                'value' => '{projectId}',
-                'placeholder' => '{projectId}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'EXPO_PUBLIC_APPWRITE_PROJECT_NAME',
-                'description' => 'Your Appwrite project name',
-                'value' => '{projectName}',
-                'placeholder' => '{projectName}',
-                'required' => true,
-                'type' => 'text'
-            ],
-        ]
-    ],
-    [
-        'key' => 'starter-for-nextjs',
-        'name' => 'Next.js starter',
-        'useCases' => ['starter'],
-        'screenshotDark' => $url . '/images/sites/templates/starter-for-nextjs-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/starter-for-nextjs-light.png',
-        'frameworks' => [
-            getFramework('NEXTJS', [
-                'providerRootDirectory' => './',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'starter-for-nextjs',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => [
-            [
-                'name' => 'NEXT_PUBLIC_APPWRITE_ENDPOINT',
-                'description' => 'Endpoint of Appwrite server',
-                'value' => '{apiEndpoint}',
-                'placeholder' => '{apiEndpoint}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'NEXT_PUBLIC_APPWRITE_PROJECT_ID',
-                'description' => 'Your Appwrite project ID',
-                'value' => '{projectId}',
-                'placeholder' => '{projectId}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'NEXT_PUBLIC_APPWRITE_PROJECT_NAME',
-                'description' => 'Your Appwrite project name',
-                'value' => '{projectName}',
-                'placeholder' => '{projectName}',
-                'required' => true,
-                'type' => 'text'
-            ],
-        ]
-    ],
-    [
-        'key' => 'starter-for-nuxt',
-        'name' => 'Nuxt starter',
-        'useCases' => ['starter'],
-        'screenshotDark' => $url . '/images/sites/templates/starter-for-nuxt-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/starter-for-nuxt-light.png',
-        'frameworks' => [
-            getFramework('NUXT', [
-                'providerRootDirectory' => './',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'starter-for-nuxt',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => [
-            [
-                'name' => 'NUXT_PUBLIC_APPWRITE_ENDPOINT',
-                'description' => 'Endpoint of Appwrite server',
-                'value' => '{apiEndpoint}',
-                'placeholder' => '{apiEndpoint}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'NUXT_PUBLIC_APPWRITE_PROJECT_ID',
-                'description' => 'Your Appwrite project ID',
-                'value' => '{projectId}',
-                'placeholder' => '{projectId}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'NUXT_PUBLIC_APPWRITE_PROJECT_NAME',
-                'description' => 'Your Appwrite project name',
-                'value' => '{projectName}',
-                'placeholder' => '{projectName}',
-                'required' => true,
-                'type' => 'text'
-            ],
-        ]
-    ],
-    [
-        'key' => 'template-for-event',
-        'name' => 'Event template',
-        'useCases' => ['starter'],
-        'screenshotDark' => $url . '/images/sites/templates/template-for-event-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/template-for-event-light.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'],
-        'screenshotDark' => $url . '/images/sites/templates/template-for-portfolio-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/template-for-portfolio-light.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'],
-        'screenshotDark' => $url . '/images/sites/templates/template-for-store-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/template-for-store-light.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'],
-        'screenshotDark' => $url . '/images/sites/templates/template-for-blog-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/template-for-blog-light.png',
-        'frameworks' => [
-            getFramework('SVELTEKIT', [
-                'providerRootDirectory' => './',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'template-for-blog',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => []
-    ],
-    [
-        'key' => 'astro-starter',
-        'name' => 'Astro starter',
-        'useCases' => ['starter'],
-        'screenshotDark' => $url . '/images/sites/templates/astro-starter-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/astro-starter-light.png',
-        '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'],
-        'screenshotDark' => $url . '/images/sites/templates/remix-starter-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/remix-starter-light.png',
-        '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'],
-        'screenshotDark' => $url . '/images/sites/templates/flutter-starter-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/flutter-starter-light.png',
-        'frameworks' => [
-            getFramework('FLUTTER', [
-                'providerRootDirectory' => './flutter/starter',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'templates-for-sites',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.2.*',
-        'variables' => [],
-    ],
-    [
-        'key' => 'nextjs-starter',
-        'name' => 'Next.js starter website',
-        'useCases' => ['starter'],
-        'screenshotDark' => $url . '/images/sites/templates/nextjs-starter-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/nextjs-starter-light.png',
-        'frameworks' => [
-            getFramework('NEXTJS', [
-                'providerRootDirectory' => './nextjs/starter',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'templates-for-sites',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.2.*',
-        'variables' => [],
-    ],
-    [
-        'key' => 'nuxt-starter',
-        'name' => 'Nuxt starter website',
-        'useCases' => ['starter'],
-        'screenshotDark' => $url . '/images/sites/templates/nuxt-starter-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/nuxt-starter-light.png',
-        'frameworks' => [
-            getFramework('NUXT', [
-                'providerRootDirectory' => './nuxt/starter',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'templates-for-sites',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.2.*',
-        'variables' => [],
-    ],
-    [
-        'key' => 'sveltekit-starter',
-        'name' => 'SvelteKit starter website',
-        'useCases' => ['starter'],
-        'screenshotDark' => $url . '/images/sites/templates/sveltekit-starter-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/sveltekit-starter-light.png',
-        'frameworks' => [
-            getFramework('SVELTEKIT', [
-                'providerRootDirectory' => './sveltekit/starter',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'templates-for-sites',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.2.*',
-        'variables' => [],
-    ],
-];
@@ -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.',
@@ -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,14 +56,11 @@ App::get('/v1/console/variables')
        $variables = new Document([
            '_APP_DOMAIN_TARGET' => System::getEnv('_APP_DOMAIN_TARGET'),
            '_APP_STORAGE_LIMIT' => +System::getEnv('_APP_STORAGE_LIMIT'),
-            '_APP_COMPUTE_SIZE_LIMIT' => +System::getEnv('_APP_COMPUTE_SIZE_LIMIT'),
+            '_APP_FUNCTIONS_SIZE_LIMIT' => +System::getEnv('_APP_FUNCTIONS_SIZE_LIMIT'),
            '_APP_USAGE_STATS' => System::getEnv('_APP_USAGE_STATS'),
            '_APP_VCS_ENABLED' => $isVcsEnabled,
            '_APP_DOMAIN_ENABLED' => $isDomainEnabled,
-            '_APP_ASSISTANT_ENABLED' => $isAssistantEnabled,
-            '_APP_DOMAIN_SITES' => System::getEnv('_APP_DOMAIN_SITES'),
-            '_APP_OPTIONS_FORCE_HTTPS' => System::getEnv('_APP_OPTIONS_FORCE_HTTPS'),
-            '_APP_DOMAINS_NAMESERVERS' => System::getEnv('_APP_DOMAINS_NAMESERVERS'),
+            '_APP_ASSISTANT_ENABLED' => $isAssistantEnabled
        ]);

        $response->dynamic($variables, Response::MODEL_CONSOLE_VARIABLES);
@@ -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;
@@ -23,17 +23,16 @@ use Utopia\App;
 use Utopia\Audit\Audit;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
-use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Authorization as AuthorizationException;
 use Utopia\Database\Exception\Conflict as ConflictException;
 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;
 use Utopia\Database\Exception\Restricted as RestrictedException;
 use Utopia\Database\Exception\Structure as StructureException;
+use Utopia\Database\Exception\Timeout as TimeoutException;
 use Utopia\Database\Exception\Truncate as TruncateException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -243,8 +242,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 +299,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 +394,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());
        }
    }

@@ -456,6 +450,88 @@ App::init()
        }
    });

+App::init()
+    ->groups(['timeout'])
+    ->inject('request')
+    ->inject('dbForProject')
+    ->action(function (Request $request, Database $dbForProject) {
+        $key = md5(json_encode([
+            $request->getMethod(),
+            $request->getURI(), // Contains databaseId & collectionId
+            $request->getParam('queries')
+        ]));
+
+        /** @var Document $document */
+        $document = Authorization::skip(fn () => $dbForProject->getDocument(
+            'slowQueries',
+            $key
+        ));
+
+        if ($document->getAttribute('blocked')) {
+            throw new Exception(Exception::QUERY_BLOCKED);
+        }
+    });
+
+App::error()
+    ->groups(['timeout'])
+    ->inject('error')
+    ->inject('request')
+    ->inject('dbForProject')
+    ->action(function (Throwable $error, Request $request, Database $dbForProject) {
+        if (!$error instanceof TimeoutException) {
+            return;
+        }
+
+        $route = Request::getRoute();
+        $collectionId = $route->getParamValue('collectionId');
+        $databaseId = $route->getParamValue('databaseId');
+        $queries = $request->getParam('queries', []);
+
+        $key = md5(json_encode([
+            $request->getMethod(),
+            $request->getURI(),
+            $queries
+        ]));
+
+        /** @var Document $document */
+        $document = Authorization::skip(fn () => $dbForProject->getDocument(
+            'slowQueries',
+            $key
+        ));
+
+        if ($document->isEmpty()) {
+            $document = Authorization::skip(fn () => $dbForProject->createDocument('slowQueries', new Document([
+                '$id' => $key,
+                'blocked' => false,
+                'count' => 1,
+                'queries' => $queries,
+                'databaseId' => $databaseId,
+                'collectionId' => $collectionId,
+                'path' => $request->getURI()
+            ])));
+        } else {
+            $document->setAttribute('count', $document->getAttribute('count') + 1);
+            $max = intval(App::getEnv('_APP_SLOW_QUERIES_MAX_HITS', 5));
+
+            if ($document->getAttribute('count') >= $max) {
+                $document->setAttribute('blocked', true);
+            }
+
+            $document = Authorization::skip(fn () => $dbForProject->updateDocument(
+                'slowQueries',
+                $document->getId(),
+                $document
+            ));
+        }
+
+        // Set the correct exception to pass to the next shutdown hook
+        if ($document->getAttribute('blocked')) {
+            App::setResource('error', fn () => new Exception(Exception::QUERY_BLOCKED));
+        } else {
+            App::setResource('error', fn () => new Exception(Exception::QUERY_TIMEOUT));
+        }
+    });
+
 App::post('/v1/databases')
    ->desc('Create database')
    ->groups(['api', 'database'])
@@ -483,8 +559,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 +610,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 +749,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 +803,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 +880,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 +904,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();
@@ -933,8 +1007,7 @@ App::get('/v1/databases/:databaseId/collections')
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('mode')
-    ->action(function (string $databaseId, array $queries, string $search, Response $response, Database $dbForProject, string $mode) {
+    ->action(function (string $databaseId, array $queries, string $search, Response $response, Database $dbForProject) {

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

@@ -1063,21 +1136,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 +1191,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);
    });
@@ -1233,8 +1299,7 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId')
    ->inject('dbForProject')
    ->inject('queueForDatabase')
    ->inject('queueForEvents')
-    ->inject('mode')
-    ->action(function (string $databaseId, string $collectionId, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, string $mode) {
+    ->action(function (string $databaseId, string $collectionId, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {

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

@@ -1563,8 +1628,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 +1705,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 +2417,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 +2476,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 +2699,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 +2797,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 +2903,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 +3215,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,7 +3420,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')

        $processDocument($collection, $document);

-        $queueForStatsUsage
+        $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
@@ -3385,7 +3451,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
 App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
    ->alias('/v1/database/collections/:collectionId/documents', ['databaseId' => 'default'])
    ->desc('List documents')
-    ->groups(['api', 'database'])
+    ->groups(['api', 'database', 'timeout'])
    ->label('scope', 'documents.read')
    ->label('resourceType', RESOURCE_TYPE_DATABASES)
    ->label('sdk', new Method(
@@ -3404,10 +3470,12 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
    ->param('databaseId', '', new UID(), 'Database ID.')
    ->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('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('request')
    ->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, Request $request, 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());
@@ -3454,9 +3522,17 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
            $cursor->setValue($cursorDocument);
        }

+        $timeout = App::getEnv('_APP_SLOW_QUERIES') === 'enabled'
+            ? App::getEnv('_APP_SLOW_QUERIES_TIMEOUT')
+            : null;
+
+        if (App::isDevelopment() && intval($request->getHeader('x-appwrite-timeout')) > 0) {
+            $timeout = intval($request->getHeader('x-appwrite-timeout'));
+            $dbForProject->setTimeout($timeout);
+        }
+
        $documents = $dbForProject->find('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $queries);
        $total = $dbForProject->count('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $queries, APP_LIMIT_COUNT);
-
        $operations = 0;

        // Add $collectionId and $databaseId for all documents
@@ -3519,9 +3595,10 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
            $processDocument($collection, $document);
        }

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

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

@@ -3583,8 +3660,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 +3738,10 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen

        $processDocument($collection, $document);

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

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

@@ -3722,15 +3801,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 +3855,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 +3894,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 +4036,10 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:docum

        $setCollection($collection, $newDocument);

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

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

@@ -4069,8 +4148,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 +4219,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
@@ -4451,3 +4531,113 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/usage')
            'documents'   =>  $usage[$metrics[0]]['data'],
        ]), Response::MODEL_USAGE_COLLECTION);
    });
+
+App::get('/v1/databases/:databaseId/slow-queries')
+    ->desc('List slow queries')
+    ->groups(['api', 'database'])
+    ->label('docs', false)
+    ->label('scope', 'documents.read')
+    ->label('sdk', new Method(
+        namespace: 'databases',
+        name: 'listSlowQueries',
+        description: '/docs/references/databases/list-slow-queries.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_SLOW_QUERY_LIST,
+            )
+        ]
+    ))
+    ->param('databaseId', '', new UID(), 'Database ID.')
+    ->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/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long.', true)
+    ->inject('response')
+    ->inject('dbForProject')
+    ->action(function ($databaseId, array $queries, Response $response, Database $dbForProject) {
+        $queries = Query::parseQueries($queries);
+        $queries[] = Query::equal('databaseId', [$databaseId]);
+
+        $cursor = Query::getByType($queries, [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]);
+        $cursor = reset($cursor);
+        if ($cursor) {
+            $documentId = $cursor->getValue();
+            $cursorDocument = $dbForProject->getDocument('slowQueries', $documentId);
+            if ($cursorDocument->isEmpty()) {
+                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Slow query '{$documentId}' for the 'cursor' value not found.");
+            }
+            $cursor->setValue($cursorDocument);
+        }
+
+        $response->dynamic(new Document([
+            'documents' => $dbForProject->find('slowQueries', $queries),
+            'total' => $dbForProject->count('slowQueries', Query::groupByType($queries)['filters'], APP_LIMIT_COUNT),
+        ]), Response::MODEL_DOCUMENT_LIST);
+    });
+
+App::get('/v1/databases/:databaseId/slow-queries/:slowQueryId')
+    ->desc('Get slow query')
+    ->groups(['api', 'database'])
+    ->label('docs', false)
+    ->label('scope', 'documents.read')
+    ->label('usage.metric', 'documents.{scope}.requests.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk', new Method(
+        namespace: 'databases',
+        name: 'getSlowQuery',
+        description: '/docs/references/databases/get-slow-query.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_SLOW_QUERY,
+            )
+        ]
+    ))
+    ->param('databaseId', '', new UID(), 'Database ID.')
+    ->param('slowQueryId', '', new UID(), 'Document ID.')
+    ->inject('response')
+    ->inject('dbForProject')
+    ->action(function (string $databaseId, string $slowQueryId, Response $response, Database $dbForProject) {
+        $document = $dbForProject->getDocument('slowQueries', $slowQueryId);
+
+        if ($document->isEmpty() || $document->getAttribute('databaseId') !== $databaseId) {
+            throw new Exception(Exception::DOCUMENT_NOT_FOUND);
+        }
+
+        $response->dynamic($document, Response::MODEL_SLOW_QUERY);
+    });
+
+App::delete('/v1/databases/:databaseId/slow-queries/:slowQueryId')
+    ->desc('Delete slow query')
+    ->desc('List  Documents')
+    ->groups(['api', 'database'])
+    ->label('scope', 'documents.write')
+    ->label('usage.metric', 'documents.{scope}.requests.delete')
+    ->label('docs', false)
+    ->label('sdk', new Method(
+        namespace: 'databases',
+        name: 'deleteSlowQuery',
+        description: '/docs/references/databases/delete-slow-query.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_NOCONTENT,
+                model: Response::MODEL_NONE,
+            )
+        ]
+    ))
+    ->param('databaseId', '', new UID(), 'Database ID.')
+    ->param('slowQueryId', '', new UID(), 'Document ID.')
+    ->inject('response')
+    ->inject('dbForProject')
+    ->action(function (string $databaseId, string $slowQueryId, Response $response, Database $dbForProject) {
+        $document = $dbForProject->getDocument('slowQueries', $slowQueryId);
+
+        if ($document->isEmpty() || $document->getAttribute('databaseId') !== $databaseId) {
+            throw new Exception(Exception::DOCUMENT_NOT_FOUND);
+        }
+
+        $dbForProject->deleteDocument('slowQueries', $slowQueryId);
+
+        $response->noContent();
+    });
@@ -13,8 +13,8 @@ use Utopia\Config\Config;
 use Utopia\Database\Document;
 use Utopia\Domains\Validator\PublicDomain;
 use Utopia\Pools\Group;
-use Utopia\Queue\Publisher;
-use Utopia\Queue\Queue;
+use Utopia\Queue\Client;
+use Utopia\Queue\Connection;
 use Utopia\Registry\Registry;
 use Utopia\Storage\Device;
 use Utopia\Storage\Device\Local;
@@ -188,6 +188,69 @@ App::get('/v1/health/cache')
        ]), Response::MODEL_HEALTH_STATUS_LIST);
    });

+App::get('/v1/health/queue')
+    ->desc('Get queue')
+    ->groups(['api', 'health'])
+    ->label('scope', 'health.read')
+    ->label('sdk', new Method(
+        auth: [AuthType::KEY],
+        namespace: 'health',
+        name: 'getQueue',
+        description: '/docs/references/health/get-queue.md',
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_HEALTH_STATUS,
+            )
+        ],
+        contentType: ContentType::JSON
+    ))
+    ->inject('response')
+    ->inject('pools')
+    ->action(function (Response $response, Group $pools) {
+
+        $output = [];
+
+        $configs = [
+            'Queue' => Config::getParam('pools-queue'),
+        ];
+
+        foreach ($configs as $key => $config) {
+            foreach ($config as $database) {
+                $checkStart = \microtime(true);
+                try {
+                    /** @var Connection $adapter */
+                    $adapter = $pools->get($database)->pop()->getResource();
+
+                    if ($adapter->ping()) {
+                        $output[] = new Document([
+                            'name' => $key . " ($database)",
+                            'status' => 'pass',
+                            'ping' => \round((\microtime(true) - $checkStart) / 1000)
+                        ]);
+                    } else {
+                        $output[] = new Document([
+                            'name' => $key . " ($database)",
+                            'status' => 'fail',
+                            'ping' => \round((\microtime(true) - $checkStart) / 1000)
+                        ]);
+                    }
+                } catch (\Throwable $th) {
+                    $output[] = new Document([
+                        'name' => $key . " ($database)",
+                        'status' => 'fail',
+                        'ping' => \round((\microtime(true) - $checkStart) / 1000)
+                    ]);
+                }
+            }
+        }
+
+        $response->dynamic(new Document([
+            'statuses' => $output,
+            'total' => count($output),
+        ]), Response::MODEL_HEALTH_STATUS_LIST);
+    });
+
 App::get('/v1/health/pubsub')
    ->desc('Get pubsub')
    ->groups(['api', 'health'])
@@ -333,12 +396,13 @@ App::get('/v1/health/queue/webhooks')
        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('queue')
    ->inject('response')
-    ->action(function (int|string $threshold, Publisher $publisher, Response $response) {
+    ->action(function (int|string $threshold, Connection $queue, Response $response) {
        $threshold = \intval($threshold);

-        $size = $publisher->getQueueSize(new Queue(Event::WEBHOOK_QUEUE_NAME));
+        $client = new Client(Event::WEBHOOK_QUEUE_NAME, $queue);
+        $size = $client->getQueueSize();

        if ($size >= $threshold) {
            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
@@ -365,12 +429,13 @@ App::get('/v1/health/queue/logs')
        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('queue')
    ->inject('response')
-    ->action(function (int|string $threshold, Publisher $publisher, Response $response) {
+    ->action(function (int|string $threshold, Connection $queue, Response $response) {
        $threshold = \intval($threshold);

-        $size = $publisher->getQueueSize(new Queue(Event::AUDITS_QUEUE_NAME));
+        $client = new Client(Event::AUDITS_QUEUE_NAME, $queue);
+        $size = $client->getQueueSize();

        if ($size >= $threshold) {
            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
@@ -453,12 +518,13 @@ App::get('/v1/health/queue/certificates')
        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('queue')
    ->inject('response')
-    ->action(function (int|string $threshold, Publisher $publisher, Response $response) {
+    ->action(function (int|string $threshold, Connection $queue, Response $response) {
        $threshold = \intval($threshold);

-        $size = $publisher->getQueueSize(new Queue(Event::CERTIFICATES_QUEUE_NAME));
+        $client = new Client(Event::CERTIFICATES_QUEUE_NAME, $queue);
+        $size = $client->getQueueSize();

        if ($size >= $threshold) {
            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
@@ -485,12 +551,13 @@ App::get('/v1/health/queue/builds')
        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('queue')
    ->inject('response')
-    ->action(function (int|string $threshold, Publisher $publisher, Response $response) {
+    ->action(function (int|string $threshold, Connection $queue, Response $response) {
        $threshold = \intval($threshold);

-        $size = $publisher->getQueueSize(new Queue(Event::BUILDS_QUEUE_NAME));
+        $client = new Client(Event::BUILDS_QUEUE_NAME, $queue);
+        $size = $client->getQueueSize();

        if ($size >= $threshold) {
            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
@@ -518,12 +585,13 @@ App::get('/v1/health/queue/databases')
    ))
    ->param('name', 'database_db_main', new Text(256), 'Queue name for which to check the queue size', true)
    ->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('queue')
    ->inject('response')
-    ->action(function (string $name, int|string $threshold, Publisher $publisher, Response $response) {
+    ->action(function (string $name, int|string $threshold, Connection $queue, Response $response) {
        $threshold = \intval($threshold);

-        $size = $publisher->getQueueSize(new Queue($name));
+        $client = new Client($name, $queue);
+        $size = $client->getQueueSize();

        if ($size >= $threshold) {
            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
@@ -550,12 +618,13 @@ App::get('/v1/health/queue/deletes')
        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('queue')
    ->inject('response')
-    ->action(function (int|string $threshold, Publisher $publisher, Response $response) {
+    ->action(function (int|string $threshold, Connection $queue, Response $response) {
        $threshold = \intval($threshold);

-        $size = $publisher->getQueueSize(new Queue(Event::DELETE_QUEUE_NAME));
+        $client = new Client(Event::DELETE_QUEUE_NAME, $queue);
+        $size = $client->getQueueSize();

        if ($size >= $threshold) {
            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
@@ -582,12 +651,13 @@ App::get('/v1/health/queue/mails')
        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('queue')
    ->inject('response')
-    ->action(function (int|string $threshold, Publisher $publisher, Response $response) {
+    ->action(function (int|string $threshold, Connection $queue, Response $response) {
        $threshold = \intval($threshold);

-        $size = $publisher->getQueueSize(new Queue(Event::MAILS_QUEUE_NAME));
+        $client = new Client(Event::MAILS_QUEUE_NAME, $queue);
+        $size = $client->getQueueSize();

        if ($size >= $threshold) {
            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
@@ -614,12 +684,13 @@ App::get('/v1/health/queue/messaging')
        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('queue')
    ->inject('response')
-    ->action(function (int|string $threshold, Publisher $publisher, Response $response) {
+    ->action(function (int|string $threshold, Connection $queue, Response $response) {
        $threshold = \intval($threshold);

-        $size = $publisher->getQueueSize(new Queue(Event::MESSAGING_QUEUE_NAME));
+        $client = new Client(Event::MESSAGING_QUEUE_NAME, $queue);
+        $size = $client->getQueueSize();

        if ($size >= $threshold) {
            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
@@ -646,12 +717,13 @@ App::get('/v1/health/queue/migrations')
        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('queue')
    ->inject('response')
-    ->action(function (int|string $threshold, Publisher $publisher, Response $response) {
+    ->action(function (int|string $threshold, Connection $queue, Response $response) {
        $threshold = \intval($threshold);

-        $size = $publisher->getQueueSize(new Queue(Event::MIGRATIONS_QUEUE_NAME));
+        $client = new Client(Event::MIGRATIONS_QUEUE_NAME, $queue);
+        $size = $client->getQueueSize();

        if ($size >= $threshold) {
            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
@@ -678,12 +750,13 @@ App::get('/v1/health/queue/functions')
        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('queue')
    ->inject('response')
-    ->action(function (int|string $threshold, Publisher $publisher, Response $response) {
+    ->action(function (int|string $threshold, Connection $queue, Response $response) {
        $threshold = \intval($threshold);

-        $size = $publisher->getQueueSize(new Queue(Event::FUNCTIONS_QUEUE_NAME));
+        $client = new Client(Event::FUNCTIONS_QUEUE_NAME, $queue);
+        $size = $client->getQueueSize();

        if ($size >= $threshold) {
            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
@@ -692,47 +765,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,
@@ -742,12 +783,13 @@ App::get('/v1/health/queue/stats-usage')
        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('queue')
    ->inject('response')
-    ->action(function (int|string $threshold, Publisher $publisher, Response $response) {
+    ->action(function (int|string $threshold, Connection $queue, Response $response) {
        $threshold = \intval($threshold);

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

        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 +798,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,
@@ -774,12 +816,13 @@ App::get('/v1/health/queue/stats-usage-dump')
        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('queue')
    ->inject('response')
-    ->action(function (int|string $threshold, Publisher $publisher, Response $response) {
+    ->action(function (int|string $threshold, Connection $queue, Response $response) {
        $threshold = \intval($threshold);

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

        if ($size >= $threshold) {
            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
@@ -857,10 +900,9 @@ App::get('/v1/health/storage')
    ->inject('response')
    ->inject('deviceForFiles')
    ->inject('deviceForFunctions')
-    ->inject('deviceForSites')
    ->inject('deviceForBuilds')
-    ->action(function (Response $response, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForSites, Device $deviceForBuilds) {
-        $devices = [$deviceForFiles, $deviceForFunctions, $deviceForSites,  $deviceForBuilds];
+    ->action(function (Response $response, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds) {
+        $devices = [$deviceForFiles, $deviceForFunctions, $deviceForBuilds];
        $checkStart = \microtime(true);

        foreach ($devices as $device) {
@@ -953,9 +995,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,
@@ -964,11 +1005,12 @@ App::get('/v1/health/queue/failed/:name')
    ]), 'The name of the queue')
    ->param('threshold', 5000, new Integer(true), 'Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.', true)
    ->inject('response')
-    ->inject('publisher')
-    ->action(function (string $name, int|string $threshold, Response $response, Publisher $publisher) {
+    ->inject('queue')
+    ->action(function (string $name, int|string $threshold, Response $response, Connection $queue) {
        $threshold = \intval($threshold);

-        $failed = $publisher->getQueueSize(new Queue($name), failedJobs: true);
+        $client = new Client($name, $queue);
+        $failed = $client->countFailedJobs();

        if ($failed >= $threshold) {
            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue failed jobs threshold hit. Current size is {$failed} and threshold is {$threshold}.");
@@ -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);
    });
@@ -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);
    });
@@ -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,7 +17,6 @@ use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Datetime as DateTimeValidator;
 use Utopia\Database\Validator\UID;
-use Utopia\Validator\Boolean;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;

@@ -41,18 +40,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,
@@ -68,7 +63,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,
@@ -81,7 +75,6 @@ App::get('/v1/project/usage')
                METRIC_BUILDS_MB_SECONDS,
                METRIC_DATABASES_OPERATIONS_READS,
                METRIC_DATABASES_OPERATIONS_WRITES,
-                METRIC_FILES_IMAGES_TRANSFORMED,
            ]
        ];

@@ -100,11 +93,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'])
                ]);
@@ -112,9 +103,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),
@@ -374,8 +363,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);
    });

@@ -400,12 +387,11 @@ App::post('/v1/project/variables')
    ))
    ->param('key', null, new Text(Database::LENGTH_KEY), 'Variable key. Max length: ' . Database::LENGTH_KEY  . ' chars.', false)
    ->param('value', null, new Text(8192, 0), 'Variable value. Max length: 8192 chars.', false)
-    ->param('secret', true, new Boolean(), 'Secret variables can be updated or deleted, but only projects can read them during build and runtime.', true)
    ->inject('project')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('dbForPlatform')
-    ->action(function (string $key, string $value, bool $secret, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
+    ->action(function (string $key, string $value, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
        $variableId = ID::unique();

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

@@ -521,25 +506,19 @@ App::put('/v1/project/variables/:variableId')
    ->param('variableId', '', new UID(), 'Variable unique ID.', false)
    ->param('key', null, new Text(255), 'Variable key. Max length: 255 chars.', false)
    ->param('value', null, new Text(8192, 0), 'Variable value. Max length: 8192 chars.', true)
-    ->param('secret', null, new Boolean(), 'Secret variables can be updated or deleted, but only projects can read them during build and runtime.', true)
    ->inject('project')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('dbForPlatform')
-    ->action(function (string $variableId, string $key, ?string $value, ?bool $secret, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
+    ->action(function (string $variableId, string $key, ?string $value, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
        $variable = $dbForProject->getDocument('variables', $variableId);
        if ($variable === false || $variable->isEmpty() || $variable->getAttribute('resourceType') !== 'project') {
            throw new Exception(Exception::VARIABLE_NOT_FOUND);
        }

-        if ($variable->getAttribute('secret') === true && $secret === false) {
-            throw new Exception(Exception::VARIABLE_CANNOT_UNSET_SECRET);
-        }
-
        $variable
            ->setAttribute('key', $key)
            ->setAttribute('value', $value ?? $variable->getAttribute('value'))
-            ->setAttribute('secret', $secret ?? $variable->getAttribute('secret'))
            ->setAttribute('search', implode(' ', [$variableId, $key, 'project']));

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

 App::get('/v1/proxy/rules')
    ->groups(['api', 'proxy'])
@@ -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;
@@ -466,15 +466,15 @@ 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) {
-        $isAppUser = Auth::isAppUser(Authorization::getRoles());
+    ->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) {
+        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());

        $url = htmlentities($url);
        if (empty($url)) {
-            if (!$isAppUser && !$isPrivilegedUser) {
+            if (!$isAPIKey && !$isPrivilegedUser) {
                throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'URL is required');
            }
        }
@@ -482,13 +482,15 @@ App::post('/v1/teams/:teamId/memberships')
        if (empty($userId) && empty($email) && empty($phone)) {
            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'At least one of userId, email, or phone is required');
        }
+        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
+        $isAppUser = Auth::isAppUser(Authorization::getRoles());

        if (!$isPrivilegedUser && !$isAppUser && empty(System::getEnv('_APP_SMTP_HOST'))) {
            throw new Exception(Exception::GENERAL_SMTP_DISABLED);
        }

        $email = \strtolower($email);
-        $name = empty($name) ? $email : $name;
+        $name = (empty($name)) ? $email : $name;
        $team = $dbForProject->getDocument('teams', $teamId);

        if ($team->isEmpty()) {
@@ -507,7 +509,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 +590,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,
@@ -617,8 +620,7 @@ App::post('/v1/teams/:teamId/memberships')
                $dbForProject->createDocument('memberships', $membership);
            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) {
@@ -629,15 +631,14 @@ 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 {
            $url = Template::parseURL($url);
-            $url['query'] = Template::mergeQuery(((isset($url['query'])) ? $url['query'] : ''), ['membershipId' => $membership->getId(), 'userId' => $invitee->getId(), 'secret' => $secret, 'teamId' => $teamId, 'teamName' => $team->getAttribute('name')]);
+            $url['query'] = Template::mergeQuery(((isset($url['query'])) ? $url['query'] : ''), ['membershipId' => $membership->getId(), 'userId' => $invitee->getId(), 'secret' => $secret, 'teamId' => $teamId]);
            $url = Template::unParseURL($url);
            if (!empty($email)) {
                $projectName = $project->isEmpty() ? 'Console' : $project->getAttribute('name', '[APP-NAME]');
@@ -715,7 +716,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();

@@ -758,11 +759,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();
@@ -1362,15 +1363,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 = [];

@@ -1417,7 +1416,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);
    });
@@ -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);
    });
@@ -14,11 +14,11 @@ use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use Appwrite\Vcs\Comment;
 use Utopia\App;
+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\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -26,35 +26,22 @@ use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Query\Cursor;
-use Utopia\Detector\Detection\Framework\Astro;
-use Utopia\Detector\Detection\Framework\Flutter;
-use Utopia\Detector\Detection\Framework\NextJs;
-use Utopia\Detector\Detection\Framework\Nuxt;
-use Utopia\Detector\Detection\Framework\Remix;
-use Utopia\Detector\Detection\Framework\SvelteKit;
-use Utopia\Detector\Detection\Packager\NPM;
-use Utopia\Detector\Detection\Packager\PNPM;
-use Utopia\Detector\Detection\Packager\Yarn;
-use Utopia\Detector\Detection\Runtime\Bun;
-use Utopia\Detector\Detection\Runtime\CPP;
-use Utopia\Detector\Detection\Runtime\Dart;
-use Utopia\Detector\Detection\Runtime\Deno;
-use Utopia\Detector\Detection\Runtime\Dotnet;
-use Utopia\Detector\Detection\Runtime\Java;
-use Utopia\Detector\Detection\Runtime\Node;
-use Utopia\Detector\Detection\Runtime\PHP;
-use Utopia\Detector\Detection\Runtime\Python;
-use Utopia\Detector\Detection\Runtime\Ruby;
-use Utopia\Detector\Detection\Runtime\Swift;
-use Utopia\Detector\Detector\Framework;
-use Utopia\Detector\Detector\Packager;
-use Utopia\Detector\Detector\Runtime;
-use Utopia\Detector\Detector\Strategy;
+use Utopia\Detector\Adapter\Bun;
+use Utopia\Detector\Adapter\CPP;
+use Utopia\Detector\Adapter\Dart;
+use Utopia\Detector\Adapter\Deno;
+use Utopia\Detector\Adapter\Dotnet;
+use Utopia\Detector\Adapter\Java;
+use Utopia\Detector\Adapter\JavaScript;
+use Utopia\Detector\Adapter\PHP;
+use Utopia\Detector\Adapter\Python;
+use Utopia\Detector\Adapter\Ruby;
+use Utopia\Detector\Adapter\Swift;
+use Utopia\Detector\Detector;
 use Utopia\System\System;
 use Utopia\Validator\Boolean;
 use Utopia\Validator\Host;
 use Utopia\Validator\Text;
-use Utopia\Validator\WhiteList;
 use Utopia\VCS\Adapter\Git\GitHub;
 use Utopia\VCS\Exception\RepositoryNotFound;

@@ -62,30 +49,29 @@ use function Swoole\Coroutine\batch;

 $createGitDeployments = function (GitHub $github, string $providerInstallationId, array $repositories, string $providerBranch, string $providerBranchUrl, string $providerRepositoryName, string $providerRepositoryUrl, string $providerRepositoryOwner, string $providerCommitHash, string $providerCommitAuthor, string $providerCommitAuthorUrl, string $providerCommitMessage, string $providerCommitUrl, string $providerPullRequestId, bool $external, Database $dbForPlatform, Build $queueForBuilds, callable $getProjectDB, Request $request) {
    $errors = [];
-    foreach ($repositories as $repository) {
+    foreach ($repositories as $resource) {
        try {
-            $resourceType = $repository->getAttribute('resourceType');
+            $resourceType = $resource->getAttribute('resourceType');

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

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

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

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

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

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

            $latestCommentId = '';

-            if (!empty($providerPullRequestId) && $resource->getAttribute('providerSilentMode', false) === false) {
+            if (!empty($providerPullRequestId) && $function->getAttribute('providerSilentMode', false) === false) {
                $latestComment = Authorization::skip(fn () => $dbForPlatform->findOne('vcsComments', [
                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
                    Query::equal('providerPullRequestId', [$providerPullRequestId]),
@@ -131,15 +117,14 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId

                if (!$latestComment->isEmpty()) {
                    $latestCommentId = $latestComment->getAttribute('providerCommentId', '');
-
                    $comment = new Comment();
                    $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
-                    $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '', '');
+                    $comment->addBuild($project, $function, $commentStatus, $deploymentId, $action);

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

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

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

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

-                $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
+                $providerRepositoryId = $resource->getAttribute('providerRepositoryId');
                try {
                    $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
                    if (empty($repositoryName)) {
@@ -208,17 +193,6 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                $providerRepositoryOwner = $pullRequestResponse['head']['repo']['name'];
            }

-            $commands = [];
-            if (!empty($resource->getAttribute('installCommand', ''))) {
-                $commands[] = $resource->getAttribute('installCommand', '');
-            }
-            if (!empty($resource->getAttribute('buildCommand', ''))) {
-                $commands[] = $resource->getAttribute('buildCommand', '');
-            }
-            if (!empty($resource->getAttribute('commands', ''))) {
-                $commands[] = $resource->getAttribute('commands', '');
-            }
-
            $deployment = $dbForProject->createDocument('deployments', new Document([
                '$id' => $deploymentId,
                '$permissions' => [
@@ -226,12 +200,11 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                    Permission::update(Role::any()),
                    Permission::delete(Role::any()),
                ],
-                'resourceId' => $resourceId,
-                'resourceInternalId' => $resourceInternalId,
-                'resourceType' => $resourceCollection,
-                'entrypoint' => $resource->getAttribute('entrypoint', ''),
-                'buildCommands' => \implode(' && ', $commands),
-                'buildOutput' => $resource->getAttribute('outputDirectory', ''),
+                'resourceId' => $functionId,
+                'resourceInternalId' => $functionInternalId,
+                'resourceType' => 'functions',
+                'entrypoint' => $function->getAttribute('entrypoint'),
+                'commands' => $function->getAttribute('commands'),
                'type' => 'vcs',
                'installationId' => $installationId,
                'installationInternalId' => $installationInternalId,
@@ -245,107 +218,21 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                'providerCommitHash' => $providerCommitHash,
                'providerCommitAuthorUrl' => $providerCommitAuthorUrl,
                'providerCommitAuthor' => $providerCommitAuthor,
-                'providerCommitMessage' => mb_strimwidth($providerCommitMessage, 0, 255, '...'),
+                'providerCommitMessage' => $providerCommitMessage,
                'providerCommitUrl' => $providerCommitUrl,
                'providerCommentId' => \strval($latestCommentId),
                'providerBranch' => $providerBranch,
-                'search' => implode(' ', [$deploymentId, $resource->getAttribute('entrypoint', '')]),
+                'search' => implode(' ', [$deploymentId, $function->getAttribute('entrypoint')]),
                'activate' => $activate,
            ]));

-            if ($resource->getCollection() === 'sites') {
-                $projectId = $project->getId();
-
-                // Deployment preview
-                $sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
-                $domain = ID::unique() . "." . $sitesDomain;
-                $ruleId = md5($domain);
-                Authorization::skip(
-                    fn () => $dbForPlatform->createDocument('rules', new Document([
-                        '$id' => $ruleId,
-                        'projectId' => $project->getId(),
-                        'projectInternalId' => $project->getInternalId(),
-                        'domain' => $domain,
-                        'type' => 'deployment',
-                        'trigger' => 'deployment',
-                        'deploymentId' => $deployment->getId(),
-                        'deploymentInternalId' => $deployment->getInternalId(),
-                        'deploymentResourceType' => 'site',
-                        'deploymentResourceId' => $resourceId,
-                        'deploymentResourceInternalId' => $resourceInternalId,
-                        'deploymentVcsProviderBranch' => $providerBranch,
-                        'status' => 'verified',
-                        'certificateId' => '',
-                        'search' => implode(' ', [$ruleId, $domain]),
-                    ]))
-                );
-
-                // VCS branch preview
-                if (!empty($providerBranch)) {
-                    $domain = "branch-{$providerBranch}-{$resource->getId()}-{$project->getId()}.{$sitesDomain}";
-                    $ruleId = md5($domain);
-                    try {
-                        Authorization::skip(
-                            fn () => $dbForPlatform->createDocument('rules', new Document([
-                                '$id' => $ruleId,
-                                'projectId' => $project->getId(),
-                                'projectInternalId' => $project->getInternalId(),
-                                'domain' => $domain,
-                                'type' => 'deployment',
-                                'trigger' => 'deployment',
-                                'deploymentId' => $deployment->getId(),
-                                'deploymentInternalId' => $deployment->getInternalId(),
-                                'deploymentResourceType' => 'site',
-                                'deploymentResourceId' => $resourceId,
-                                'deploymentResourceInternalId' => $resourceInternalId,
-                                'deploymentVcsProviderBranch' => $providerBranch,
-                                'status' => 'verified',
-                                'certificateId' => '',
-                                'search' => implode(' ', [$ruleId, $domain]),
-                            ]))
-                        );
-                    } catch (Duplicate $err) {
-                        // Ignore, rule already exists; will be updated by builds worker
-                    }
-                }
-
-                // VCS commit preview
-                if (!empty($providerCommitHash)) {
-                    $domain = "commit-{$providerCommitHash}-{$resource->getId()}-{$project->getId()}.{$sitesDomain}";
-                    $ruleId = md5($domain);
-                    try {
-                        Authorization::skip(
-                            fn () => $dbForPlatform->createDocument('rules', new Document([
-                                '$id' => $ruleId,
-                                'projectId' => $project->getId(),
-                                'projectInternalId' => $project->getInternalId(),
-                                'domain' => $domain,
-                                'type' => 'deployment',
-                                'trigger' => 'deployment',
-                                'deploymentId' => $deployment->getId(),
-                                'deploymentInternalId' => $deployment->getInternalId(),
-                                'deploymentResourceType' => 'site',
-                                'deploymentResourceId' => $resourceId,
-                                'deploymentResourceInternalId' => $resourceInternalId,
-                                'deploymentVcsProviderBranch' => $providerBranch,
-                                'status' => 'verified',
-                                'certificateId' => '',
-                                'search' => implode(' ', [$ruleId, $domain]),
-                            ]))
-                        );
-                    } catch (Duplicate $err) {
-                        // Ignore, rule already exists; will be updated by builds worker
-                    }
-                }
-            }
-
-            if (!empty($providerCommitHash) && $resource->getAttribute('providerSilentMode', false) === false) {
-                $resourceName = $resource->getAttribute('name');
+            if (!empty($providerCommitHash) && $function->getAttribute('providerSilentMode', false) === false) {
+                $functionName = $function->getAttribute('name');
                $projectName = $project->getAttribute('name');
-                $name = "{$resourceName} ({$projectName})";
+                $name = "{$functionName} ({$projectName})";
                $message = 'Starting...';

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

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

            $queueForBuilds
                ->setType(BUILD_TYPE_DEPLOYMENT)
-                ->setResource($resource)
+                ->setResource($function)
                ->setDeployment($deployment)
                ->setProject($project); // set the project because it won't be set for git deployments

-            $queueForBuilds->trigger(); // must trigger here so that we create a build for each function/site
+            $queueForBuilds->trigger(); // must trigger here so that we create a build for each function

            //TODO: Add event?
        } catch (Throwable $e) {
@@ -629,9 +516,8 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
        ]), Response::MODEL_VCS_CONTENT_LIST);
    });

-App::post('/v1/vcs/github/installations/:installationId/detections')
-    ->alias('/v1/vcs/github/installations/:installationId/providerRepositories/:providerRepositoryId/detection')
-    ->desc('Create repository detection')
+App::post('/v1/vcs/github/installations/:installationId/providerRepositories/:providerRepositoryId/detection')
+    ->desc('Detect runtime settings from source code')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.write')
    ->label('sdk', new Method(
@@ -642,22 +528,18 @@ App::post('/v1/vcs/github/installations/:installationId/detections')
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_DETECTION_RUNTIME,
-            ),
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_DETECTION_FRAMEWORK,
+                model: Response::MODEL_DETECTION,
            )
        ]
    ))
    ->param('installationId', '', new Text(256), 'Installation Id')
    ->param('providerRepositoryId', '', new Text(256), 'Repository Id')
-    ->param('type', '', new WhiteList(['runtime', 'framework']), 'Detector type. Must be one of the following: runtime, framework')
    ->param('providerRootDirectory', '', new Text(256, 0), 'Path to Root Directory', true)
    ->inject('gitHub')
    ->inject('response')
+    ->inject('project')
    ->inject('dbForPlatform')
-    ->action(function (string $installationId, string $providerRepositoryId, string $type, string $providerRootDirectory, GitHub $github, Response $response, Database $dbForPlatform) {
+    ->action(function (string $installationId, string $providerRepositoryId, string $providerRootDirectory, GitHub $github, Response $response, Document $project, Database $dbForPlatform) {
        $installation = $dbForPlatform->getDocument('installations', $installationId);

        if ($installation->isEmpty()) {
@@ -683,108 +565,32 @@ App::post('/v1/vcs/github/installations/:installationId/detections')
        $files = \array_column($files, 'name');
        $languages = $github->listRepositoryLanguages($owner, $repositoryName);

-        $detector = new Packager($files);
-        $detector
-            ->addOption(new Yarn())
-            ->addOption(new PNPM())
-            ->addOption(new NPM());
-        $detection = $detector->detect();
+        $detectorFactory = new Detector($files, $languages);

-        $packager = !\is_null($detection) ? $detection->getName() : 'npm';
+        $detectorFactory
+            ->addDetector(new JavaScript())
+            ->addDetector(new Bun())
+            ->addDetector(new PHP())
+            ->addDetector(new Python())
+            ->addDetector(new Dart())
+            ->addDetector(new Swift())
+            ->addDetector(new Ruby())
+            ->addDetector(new Java())
+            ->addDetector(new CPP())
+            ->addDetector(new Deno())
+            ->addDetector(new Dotnet());

-        if ($type === 'framework') {
-            $output = new Document([
-                'framework' => '',
-                'installCommand' => '',
-                'buildCommand' => '',
-                'outputDirectory' => '',
-            ]);
+        $runtime = $detectorFactory->detect();

-            $detector = new Framework($files, $packager);
-            $detector
-                ->addOption(new Flutter())
-                ->addOption(new Nuxt())
-                ->addOption(new Astro())
-                ->addOption(new SvelteKit())
-                ->addOption(new NextJs())
-                ->addOption(new Remix());
+        $runtimes = Config::getParam('runtimes');
+        $runtimeDetail = \array_reverse(\array_filter(\array_keys($runtimes), function ($key) use ($runtime, $runtimes) {
+            return $runtimes[$key]['key'] === $runtime;
+        }))[0] ?? '';

-            $framework = $detector->detect();
+        $detection = [];
+        $detection['runtime'] = $runtimeDetail;

-            if (!\is_null($framework)) {
-                $output->setAttribute('installCommand', $framework->getInstallCommand());
-                $output->setAttribute('buildCommand', $framework->getBuildCommand());
-                $output->setAttribute('outputDirectory', $framework->getOutputDirectory());
-                $framework = $framework->getName();
-            } else {
-                $framework = 'other';
-                $output->setAttribute('installCommand', '');
-                $output->setAttribute('buildCommand', '');
-                $output->setAttribute('outputDirectory', '');
-            }
-
-            $frameworks = Config::getParam('frameworks');
-            if (!\in_array($framework, array_keys($frameworks), true)) {
-                $framework = 'other';
-            }
-            $output->setAttribute('framework', $framework);
-        } else {
-            $output = new Document([
-                'runtime' => '',
-                'commands' => '',
-                'entrypoint' => '',
-            ]);
-
-            $strategies = [
-                new Strategy(Strategy::FILEMATCH),
-                new Strategy(Strategy::LANGUAGES),
-                new Strategy(Strategy::EXTENSION),
-            ];
-
-            foreach ($strategies as $strategy) {
-                $detector = new Runtime($strategy === Strategy::LANGUAGES ? $languages : $files, $strategy, $packager);
-                $detector
-                    ->addOption(new Node())
-                    ->addOption(new Bun())
-                    ->addOption(new Deno())
-                    ->addOption(new PHP())
-                    ->addOption(new Python())
-                    ->addOption(new Dart())
-                    ->addOption(new Swift())
-                    ->addOption(new Ruby())
-                    ->addOption(new Java())
-                    ->addOption(new CPP())
-                    ->addOption(new Dotnet());
-
-                $runtime = $detector->detect();
-
-                if (!\is_null($runtime)) {
-                    $output->setAttribute('commands', $runtime->getCommands());
-                    $output->setAttribute('entrypoint', $runtime->getEntrypoint());
-                    $runtime = $runtime->getName();
-                    break;
-                }
-            }
-
-            if (!empty($runtime)) {
-                $runtimes = Config::getParam('runtimes');
-                $runtimeWithVersion = '';
-                foreach ($runtimes as $runtimeKey => $runtimeConfig) {
-                    if ($runtimeConfig['key'] === $runtime) {
-                        $runtimeWithVersion = $runtimeKey;
-                    }
-                }
-
-                if (empty($runtimeWithVersion)) {
-                    throw new Exception(Exception::FUNCTION_RUNTIME_NOT_DETECTED);
-                }
-
-                $output->setAttribute('runtime', $runtimeWithVersion);
-            } else {
-                throw new Exception(Exception::FUNCTION_RUNTIME_NOT_DETECTED);
-            }
-        }
-        $response->dynamic($output, $type === 'framework' ? Response::MODEL_DETECTION_FRAMEWORK : Response::MODEL_DETECTION_RUNTIME);
+        $response->dynamic(new Document($detection), Response::MODEL_DETECTION);
    });

 App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
@@ -799,21 +605,17 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_PROVIDER_REPOSITORY_RUNTIME_LIST,
-            ),
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_PROVIDER_REPOSITORY_FRAMEWORK_LIST,
+                model: Response::MODEL_PROVIDER_REPOSITORY_LIST,
            )
        ]
    ))
    ->param('installationId', '', new Text(256), 'Installation Id')
-    ->param('type', '', new WhiteList(['runtime', 'framework']), 'Detector type. Must be one of the following: runtime, framework')
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('gitHub')
    ->inject('response')
+    ->inject('project')
    ->inject('dbForPlatform')
-    ->action(function (string $installationId, string $type, string $search, GitHub $github, Response $response, Database $dbForPlatform) {
+    ->action(function (string $installationId, string $search, GitHub $github, Response $response, Document $project, Database $dbForPlatform) {
        if (empty($search)) {
            $search = "";
        }
@@ -843,86 +645,39 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
            return $repo;
        }, $repos);

-        $repos = batch(\array_map(function ($repo) use ($type, $github) {
-            return function () use ($repo, $type, $github) {
-                $files = $github->listRepositoryContents($repo['organization'], $repo['name'], '');
-                $files = \array_column($files, 'name');
-
-                $detector = new Packager($files);
-                $detector
-                    ->addOption(new Yarn())
-                    ->addOption(new PNPM())
-                    ->addOption(new NPM());
-                $detection = $detector->detect();
-
-                $packager = !\is_null($detection) ? $detection->getName() : 'npm';
-
-                if ($type === 'framework') {
-                    $frameworkDetector = new Framework($files, $packager);
-                    $frameworkDetector
-                        ->addOption(new Flutter())
-                        ->addOption(new Nuxt())
-                        ->addOption(new Astro())
-                        ->addOption(new SvelteKit())
-                        ->addOption(new NextJs())
-                        ->addOption(new Remix());
-
-                    $detectedFramework = $frameworkDetector->detect();
-
-                    if (!\is_null($detectedFramework)) {
-                        $framework = $detectedFramework->getName();
-                    } else {
-                        $framework = 'other';
-                    }
-
-                    $frameworks = Config::getParam('frameworks');
-                    if (!\in_array($framework, array_keys($frameworks), true)) {
-                        $framework = 'other';
-                    }
-                    $repo['framework'] = $framework;
-                } else {
+        $repos = batch(\array_map(function ($repo) use ($github) {
+            return function () use ($repo, $github) {
+                try {
+                    $files = $github->listRepositoryContents($repo['organization'], $repo['name'], '');
+                    $files = \array_column($files, 'name');
                    $languages = $github->listRepositoryLanguages($repo['organization'], $repo['name']);

-                    $strategies = [
-                        new Strategy(Strategy::FILEMATCH),
-                        new Strategy(Strategy::LANGUAGES),
-                        new Strategy(Strategy::EXTENSION),
-                    ];
+                    $detectorFactory = new Detector($files, $languages);

-                    foreach ($strategies as $strategy) {
-                        $detector = new Runtime($strategy === Strategy::LANGUAGES ? $languages : $files, $strategy, $packager);
-                        $detector
-                            ->addOption(new Node())
-                            ->addOption(new Bun())
-                            ->addOption(new Deno())
-                            ->addOption(new PHP())
-                            ->addOption(new Python())
-                            ->addOption(new Dart())
-                            ->addOption(new Swift())
-                            ->addOption(new Ruby())
-                            ->addOption(new Java())
-                            ->addOption(new CPP())
-                            ->addOption(new Dotnet());
+                    $detectorFactory
+                        ->addDetector(new JavaScript())
+                        ->addDetector(new Bun())
+                        ->addDetector(new PHP())
+                        ->addDetector(new Python())
+                        ->addDetector(new Dart())
+                        ->addDetector(new Swift())
+                        ->addDetector(new Ruby())
+                        ->addDetector(new Java())
+                        ->addDetector(new CPP())
+                        ->addDetector(new Deno())
+                        ->addDetector(new Dotnet());

-                        $runtime = $detector->detect();
+                    $runtime = $detectorFactory->detect();

-                        if (!\is_null($runtime)) {
-                            $runtime = $runtime->getName();
-                            break;
-                        }
-                    }
+                    $runtimes = Config::getParam('runtimes');
+                    $runtimeDetail = \array_reverse(\array_filter(\array_keys($runtimes), function ($key) use ($runtime, $runtimes) {
+                        return $runtimes[$key]['key'] === $runtime;
+                    }))[0] ?? '';

-                    if (!empty($runtime)) {
-                        $runtimes = Config::getParam('runtimes');
-                        $runtimeWithVersion = '';
-                        foreach ($runtimes as $runtimeKey => $runtimeConfig) {
-                            if ($runtimeConfig['key'] === $runtime) {
-                                $runtimeWithVersion = $runtimeKey;
-                            }
-                        }
-
-                        $repo['runtime'] = $runtimeWithVersion ?? '';
-                    }
+                    $repo['runtime'] = $runtimeDetail;
+                } catch (Throwable $error) {
+                    $repo['runtime'] = "";
+                    Console::warning("Runtime not detected for " . $repo['organization'] . "/" . $repo['name']);
                }
                return $repo;
            };
@@ -933,9 +688,9 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
        }, $repos);

        $response->dynamic(new Document([
-            $type === 'framework' ? 'frameworkProviderRepositories' : 'runtimeProviderRepositories' => $repos,
+            'providerRepositories' => $repos,
            'total' => \count($repos),
-        ]), ($type === 'framework') ? Response::MODEL_PROVIDER_REPOSITORY_FRAMEWORK_LIST : Response::MODEL_PROVIDER_REPOSITORY_RUNTIME_LIST);
+        ]), Response::MODEL_PROVIDER_REPOSITORY_LIST);
    });

 App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
@@ -1202,7 +957,7 @@ App::post('/v1/vcs/github/events')

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

-                //find resourceId from relevant resources table
+                //find functionId from functions table
                $repositories = Authorization::skip(fn () => $dbForPlatform->find('repositories', [
                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
                    Query::limit(100),
@@ -1214,7 +969,7 @@ App::post('/v1/vcs/github/events')
                }
            } elseif ($event == $github::EVENT_INSTALLATION) {
                if ($parsedPayload["action"] == "deleted") {
-                    // TODO: Use worker for this job instead (update function/site as well)
+                    // TODO: Use worker for this job instead (update function as well)
                    $providerInstallationId = $parsedPayload["installationId"];

                    $installations = $dbForPlatform->find('installations', [
@@ -3,30 +3,25 @@
 require_once __DIR__ . '/../init.php';

 use Ahc\Jwt\JWT;
-use Ahc\Jwt\JWTException;
 use Appwrite\Auth\Auth;
-use Appwrite\Auth\Key;
 use Appwrite\Event\Certificate;
 use Appwrite\Event\Event;
 use Appwrite\Event\Func;
-use Appwrite\Event\StatsUsage;
+use Appwrite\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;
 use Appwrite\Utopia\Request\Filters\V18 as RequestV18;
-use Appwrite\Utopia\Request\Filters\V19 as RequestV19;
 use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Response\Filters\V16 as ResponseV16;
 use Appwrite\Utopia\Response\Filters\V17 as ResponseV17;
 use Appwrite\Utopia\Response\Filters\V18 as ResponseV18;
-use Appwrite\Utopia\Response\Filters\V19 as ResponseV19;
 use Appwrite\Utopia\View;
 use Executor\Executor;
 use MaxMind\Db\Reader;
@@ -47,7 +42,6 @@ use Utopia\Logger\Adapter\Sentry;
 use Utopia\Logger\Log;
 use Utopia\Logger\Log\User;
 use Utopia\Logger\Logger;
-use Utopia\Platform\Service;
 use Utopia\System\System;
 use Utopia\Validator\Hostname;
 use Utopia\Validator\Text;
@@ -56,7 +50,7 @@ Config::setParam('domainVerification', false);
 Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);

-function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey)
+function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname)
 {
    $utopia->getRoute()?->label('error', __DIR__ . '/../views/general/error.phtml');

@@ -67,9 +61,9 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw

    // TODO: @christyjacob remove once we migrate the rules in 1.7.x
    if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
-        $rule = Authorization::skip(fn () => $dbForPlatform->getDocument('rules', md5($host)));
+        $route = Authorization::skip(fn () => $dbForPlatform->getDocument('rules', md5($host)));
    } else {
-        $rule = Authorization::skip(
+        $route = Authorization::skip(
            fn () => $dbForPlatform->find('rules', [
                Query::equal('domain', [$host]),
                Query::limit(1)
@@ -77,12 +71,12 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        )[0] ?? new Document();
    }

-    if ($rule->isEmpty()) {
-        if ($host === System::getEnv('_APP_DOMAIN_FUNCTIONS', '') || $host === System::getEnv('_APP_DOMAIN_SITES', '')) {
+    if ($route->isEmpty()) {
+        if ($host === System::getEnv('_APP_DOMAIN_FUNCTIONS', '')) {
            throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'This domain cannot be used for security reasons. Please use any subdomain instead.');
        }

-        if (\str_ends_with($host, System::getEnv('_APP_DOMAIN_FUNCTIONS', '')) || \str_ends_with($host, System::getEnv('_APP_DOMAIN_SITES', ''))) {
+        if (\str_ends_with($host, System::getEnv('_APP_DOMAIN_FUNCTIONS', ''))) {
            throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'This domain is not connected to any Appwrite resource yet. Please configure custom domain or function domain to allow this request.');
        }

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

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

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

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

-    if ($type === 'deployment') {
-        if (System::getEnv('_APP_OPTIONS_COMPUTE_FORCE_HTTPS', 'disabled') === 'enabled') { // Force HTTPS
-            if ($request->getProtocol() !== 'https' && $request->getHostname() !== APP_HOSTNAME_INTERNAL) {
+    if ($type === 'function') {
+        $method = $utopia->getRoute()?->getLabel('sdk', null);
+
+        if (empty($method)) {
+            $utopia->getRoute()?->label('sdk', new Method(
+                namespace: 'functions',
+                name: 'createExecution',
+                description: '/docs/references/functions/create-execution.md',
+                auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+                responses: [
+                    new SDKResponse(
+                        code: Response::STATUS_CODE_CREATED,
+                        model: Response::MODEL_EXECUTION,
+                    )
+                ],
+                contentType: ContentType::MULTIPART,
+                requestType: 'application/json',
+            ));
+        } else {
+            /** @var Method $method */
+            $method->setNamespace('functions');
+            $method->setMethodName('createExecution');
+            $utopia->getRoute()?->label('sdk', $method);
+        }
+
+        if (System::getEnv('_APP_OPTIONS_FUNCTIONS_FORCE_HTTPS', 'disabled') === 'enabled') { // Force HTTPS
+            if ($request->getProtocol() !== 'https') {
                if ($request->getMethod() !== Request::METHOD_GET) {
                    throw new AppwriteException(AppwriteException::GENERAL_PROTOCOL_UNSUPPORTED, 'Method unsupported over HTTP. Please use HTTPS instead.');
                }
+
                return $response->redirect('https://' . $request->getHostname() . $request->getURI());
            }
        }

-        /** @var Database $dbForProject */
-        $dbForProject = $getProjectDB($project);
-
-        $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $rule->getAttribute('deploymentId')));
-
-        if ($deployment->getAttribute('resourceType', '') === 'functions') {
-            $type = 'function';
-        } elseif ($deployment->getAttribute('resourceType', '') === 'sites') {
-            $type = 'site';
-        }
-
-        $resource = $type === 'function' ?
-            Authorization::skip(fn () => $dbForProject->getDocument('functions', $deployment->getAttribute('resourceId', ''))) :
-            Authorization::skip(fn () => $dbForProject->getDocument('sites', $deployment->getAttribute('resourceId', '')));
-
-        $isPreview = $type === 'function' ? false : ($rule->getAttribute('trigger', '') !== 'manual');
+        $functionId = $route->getAttribute('resourceId');
+        $projectId = $route->getAttribute('projectId');

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

-        $protocol = $request->getProtocol();
-
-        /**
-            Ensure preview authorization
-            - Authorization is skippable for tests, and build screenshot
-            - If cookie is not sent by client -> not authorized
-            - If JWT in cookie is invalid or expired -> not authorized
-            - If user is blocked or removed -> not authorized
-            - If user's session is removed or expired -> not authorized
-            - If user is not member of team of this deployment -> not authorized
-            - If not authorized, redirect to Console redirect UI
-            - If authorized, continue as if auth was not required
-        */
-        $requirePreview = \is_null($apiKey) || !$apiKey->isPreviewAuthDisabled();
-        if ($isPreview && $requirePreview) {
-            $cookie = $request->getCookie(Auth::$cookieNamePreview, '');
-            $authorized = false;
-
-            // Security checks to mark authorized true
-            if (!empty($cookie)) {
-                $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 3600, 0);
-
-                $payload = [];
-                try {
-                    $payload = $jwt->decode($cookie);
-                } catch (JWTException $error) {
-                    // Authorized remains false
-                }
-
-                $userExists = false;
-                $userId = $payload['userId'] ?? '';
-                if (!empty($userId)) {
-                    $user = Authorization::skip(fn () => $dbForPlatform->getDocument('users', $userId));
-                    if (!$user->isEmpty() && $user->getAttribute('status', false)) {
-                        $userExists = true;
-                    }
-                }
-
-                $sessionExists = false;
-                $jwtSessionId = $payload['sessionId'] ?? '';
-                if (!empty($jwtSessionId) && !empty($user->find('$id', $jwtSessionId, 'sessions'))) {
-                    $sessionExists = true;
-                }
-
-                $membershipExists = false;
-                $project = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
-                if (!$project->isEmpty() && isset($user)) {
-                    $teamId = $project->getAttribute('teamId', '');
-                    $membership = $user->find('teamId', $teamId, 'memberships');
-                    if (!empty($membership)) {
-                        $membershipExists = true;
-                    }
-                }
-
-                if ($userExists && $sessionExists && $membershipExists) {
-                    $authorized = true;
-                }
-            }
-
-            if (!$authorized) {
-                $url = (System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https') . "://" . System::getEnv('_APP_DOMAIN');
-                $response
-                    ->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
-                    ->addHeader('Pragma', 'no-cache')
-                    ->redirect($url . '/console/auth/preview?'
-                        . \http_build_query([
-                            'projectId' => $projectId,
-                            'origin' => $protocol . '://' . $host,
-                            'path' => $path
-                        ]));
-                return true;
-            }
-        }

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

        $requestHeaders = $request->getHeaders();

-        if ($resource->isEmpty() || !$resource->getAttribute('enabled')) {
+        $project = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
+
+        $dbForProject = $getProjectDB($project);
+
+        $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));
+
+        if ($function->isEmpty() || !$function->getAttribute('enabled')) {
            throw new AppwriteException(AppwriteException::FUNCTION_NOT_FOUND);
        }

-        if ($isResourceBlocked($project, $type === 'function' ? RESOURCE_TYPE_FUNCTIONS : RESOURCE_TYPE_SITES, $resource->getId())) {
+        if ($isResourceBlocked($project, RESOURCE_TYPE_FUNCTIONS, $functionId)) {
            throw new AppwriteException(AppwriteException::GENERAL_RESOURCE_BLOCKED);
        }

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

-        $runtime = match ($type) {
-            'function' => $runtimes[$resource->getAttribute('runtime')] ?? null,
-            'site' => $runtimes[$resource->getAttribute('buildRuntime')] ?? null,
-            default => null
-        };
-
-        // Static site enforced runtime
-        if ($resource->getAttribute('adapter', '') === 'static') {
-            $runtime = $runtimes['static-1'] ?? null;
-        }
+        $runtime = (isset($runtimes[$function->getAttribute('runtime', '')])) ? $runtimes[$function->getAttribute('runtime', '')] : null;

        if (\is_null($runtime)) {
-            throw new AppwriteException(AppwriteException::FUNCTION_RUNTIME_UNSUPPORTED, 'Runtime "' . $resource->getAttribute('runtime', '') . '" is not supported');
+            throw new AppwriteException(AppwriteException::FUNCTION_RUNTIME_UNSUPPORTED, 'Runtime "' . $function->getAttribute('runtime', '') . '" is not supported');
        }

-        if ($deployment->getAttribute('status') !== 'ready') {
+        $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $function->getAttribute('deployment', '')));
+
+        if ($deployment->getAttribute('resourceId') !== $function->getId()) {
+            throw new AppwriteException(AppwriteException::DEPLOYMENT_NOT_FOUND, 'Deployment not found. Create a deployment before trying to execute a function');
+        }
+
+        if ($deployment->isEmpty()) {
+            throw new AppwriteException(AppwriteException::DEPLOYMENT_NOT_FOUND, 'Deployment not found. Create a deployment before trying to execute a function');
+        }
+
+        /** Check if build has completed */
+        $build = Authorization::skip(fn () => $dbForProject->getDocument('builds', $deployment->getAttribute('buildId', '')));
+        if ($build->isEmpty()) {
+            throw new AppwriteException(AppwriteException::BUILD_NOT_FOUND);
+        }
+
+        if ($build->getAttribute('status') !== 'ready') {
            throw new AppwriteException(AppwriteException::BUILD_NOT_READY);
        }

-        if ($type === 'function') {
-            $permissions = $resource->getAttribute('execute');
-            if (!(\in_array('any', $permissions)) && !(\in_array('guests', $permissions))) {
-                throw new AppwriteException(AppwriteException::USER_UNAUTHORIZED, 'To execute function using domain, execute permissions must include "any" or "guests"');
-            }
+        $permissions = $function->getAttribute('execute');
+
+        if (!(\in_array('any', $permissions)) && !(\in_array('guests', $permissions))) {
+            throw new AppwriteException(AppwriteException::USER_UNAUTHORIZED, 'To execute function using domain, execute permissions must include "any" or "guests"');
        }

+        $jwtExpiry = $function->getAttribute('timeout', 900);
+        $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', $jwtExpiry, 0);
+        $apiKey = $jwtObj->encode([
+            'projectId' => $project->getId(),
+            'scopes' => $function->getAttribute('scopes', [])
+        ]);
+
        $headers = \array_merge([], $requestHeaders);
+        $headers['x-appwrite-key'] = API_KEY_DYNAMIC . '_' . $apiKey;
+        $headers['x-appwrite-trigger'] = 'http';
        $headers['x-appwrite-user-id'] = '';
+        $headers['x-appwrite-user-jwt'] = '';
        $headers['x-appwrite-country-code'] = '';
        $headers['x-appwrite-continent-code'] = '';
        $headers['x-appwrite-continent-eu'] = 'false';

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

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

        $durationStart = \microtime(true);

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

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

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

@@ -384,14 +313,14 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        // Appwrite vars
        $vars = \array_merge($vars, [
            'APPWRITE_FUNCTION_API_ENDPOINT' => $endpoint,
-            'APPWRITE_FUNCTION_ID' => $resource->getId(),
-            'APPWRITE_FUNCTION_NAME' => $resource->getAttribute('name'),
+            'APPWRITE_FUNCTION_ID' => $functionId,
+            'APPWRITE_FUNCTION_NAME' => $function->getAttribute('name'),
            'APPWRITE_FUNCTION_DEPLOYMENT' => $deployment->getId(),
            'APPWRITE_FUNCTION_PROJECT_ID' => $project->getId(),
            'APPWRITE_FUNCTION_RUNTIME_NAME' => $runtime['name'] ?? '',
            'APPWRITE_FUNCTION_RUNTIME_VERSION' => $runtime['version'] ?? '',
-            'APPWRITE_FUNCTION_CPUS' => $spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT,
-            'APPWRITE_FUNCTION_MEMORY' => $spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT,
+            'APPWRITE_FUNCTION_CPUS' => $spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT,
+            'APPWRITE_FUNCTION_MEMORY' => $spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT,
            'APPWRITE_VERSION' => APP_VERSION_STABLE,
            'APPWRITE_REGION' => $project->getAttribute('region'),
            'APPWRITE_DEPLOYMENT_TYPE' => $deployment->getAttribute('type', ''),
@@ -409,93 +338,32 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            'APPWRITE_VCS_ROOT_DIRECTORY' => $deployment->getAttribute('providerRootDirectory', ''),
        ]);

-        // SPA fallbackFile override
-        if ($resource->getAttribute('adapter', '') === 'static' && $resource->getAttribute('fallbackFile', '') !== '') {
-            $vars['OPEN_RUNTIMES_STATIC_FALLBACK'] = $resource->getAttribute('fallbackFile', '');
-        }
-
        /** Execute function */
        $executor = new Executor(System::getEnv('_APP_EXECUTOR_HOST'));
        try {
-            $version = match ($type) {
-                'function' => $resource->getAttribute('version', 'v2'),
-                'site' => 'v5',
-            };
-            $entrypoint = match ($type) {
-                'function' => $deployment->getAttribute('entrypoint', ''),
-                'site' => '',
-            };
-
-            if ($type === 'function') {
-                $runtimeEntrypoint = match ($version) {
-                    'v2' => '',
-                    default => 'cp /tmp/code.tar.gz /mnt/code/code.tar.gz && nohup helpers/start.sh "' . $runtime['startCommand'] . '"'
-                };
-            } elseif ($type === 'site') {
-                $frameworks = Config::getParam('frameworks', []);
-                $framework = $frameworks[$resource->getAttribute('framework', '')] ?? null;
-
-                $startCommand = $runtime['startCommand'];
-
-                if (!is_null($framework)) {
-                    $adapter = ($framework['adapters'] ?? [])[$resource->getAttribute('adapter', '')] ?? null;
-                    if (!is_null($adapter) && isset($adapter['startCommand'])) {
-                        $startCommand = $adapter['startCommand'];
-                    }
-                }
-
-                $runtimeEntrypoint = 'cp /tmp/code.tar.gz /mnt/code/code.tar.gz && nohup helpers/start.sh "' . $startCommand . '"';
-            }
-
-            $entrypoint = match ($type) {
-                'function' => $deployment->getAttribute('entrypoint', ''),
-                'site' => '',
-            };
-
+            $version = $function->getAttribute('version', 'v2');
+            $command = $runtime['startCommand'];
+            $command = $version === 'v2' ? '' : 'cp /tmp/code.tar.gz /mnt/code/code.tar.gz && nohup helpers/start.sh "' . $command . '"';
            $executionResponse = $executor->createExecution(
                projectId: $project->getId(),
                deploymentId: $deployment->getId(),
                body: \strlen($body) > 0 ? $body : null,
                variables: $vars,
-                timeout: $resource->getAttribute('timeout', 30),
+                timeout: $function->getAttribute('timeout', 0),
                image: $runtime['image'],
-                source: $deployment->getAttribute('buildPath', ''),
-                entrypoint: $entrypoint,
+                source: $build->getAttribute('path', ''),
+                entrypoint: $deployment->getAttribute('entrypoint', ''),
                version: $version,
                path: $path,
                method: $method,
                headers: $headers,
-                runtimeEntrypoint: $runtimeEntrypoint,
-                cpus: $spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT,
-                memory: $spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT,
-                logging: $resource->getAttribute('logging', true),
+                runtimeEntrypoint: $command,
+                cpus: $spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT,
+                memory: $spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT,
+                logging: $function->getAttribute('logging', true),
                requestTimeout: 30
            );

-            // Branded 404 override
-            if ($executionResponse['statusCode'] === 404 && $resource->getAttribute('adapter', '') === 'static') {
-                $layout = new View(__DIR__ . '/../views/general/404.phtml');
-                $executionResponse['body'] = $layout->render();
-                $executionResponse['headers']['content-length'] = \strlen($executionResponse['body']);
-            }
-
-            // Branded banner for previews
-            if (\is_null($apiKey) || $apiKey->isBannerDisabled() === false) {
-                $transformation = new Transformation();
-                $transformation->addAdapter(new Preview());
-                $transformation->setInput($executionResponse['body']);
-                $transformation->setTraits($executionResponse['headers']);
-                if ($isPreview && $transformation->transform()) {
-                    $executionResponse['body'] = $transformation->getOutput();
-
-                    foreach ($executionResponse['headers'] as $key => $value) {
-                        if (\strtolower($key) === 'content-length') {
-                            $executionResponse['headers'][$key] = \strlen($executionResponse['body']);
-                        }
-                    }
-                }
-            }
-
            $headersFiltered = [];
            foreach ($executionResponse['headers'] as $key => $value) {
                if (\in_array(\strtolower($key), FUNCTION_ALLOWLIST_HEADERS_RESPONSE)) {
@@ -506,38 +374,31 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            /** Update execution status */
            $status = $executionResponse['statusCode'] >= 500 ? 'failed' : 'completed';
            $execution->setAttribute('status', $status);
-            $execution->setAttribute('logs', $executionResponse['logs']);
-            $execution->setAttribute('errors', $executionResponse['errors']);
            $execution->setAttribute('responseStatusCode', $executionResponse['statusCode']);
            $execution->setAttribute('responseHeaders', $headersFiltered);
+            $execution->setAttribute('logs', $executionResponse['logs']);
+            $execution->setAttribute('errors', $executionResponse['errors']);
            $execution->setAttribute('duration', $executionResponse['duration']);
+
        } catch (\Throwable $th) {
            $durationEnd = \microtime(true);

            $execution
                ->setAttribute('duration', $durationEnd - $durationStart)
-                ->setAttribute('responseStatusCode', 500);
-
-            if ($type === 'function') {
-                $execution
-                    ->setAttribute('status', 'failed')
-                    ->setAttribute('errors', $th->getMessage() . '\nError Code: ' . $th->getCode());
-            }
+                ->setAttribute('status', 'failed')
+                ->setAttribute('responseStatusCode', 500)
+                ->setAttribute('errors', $th->getMessage() . '\nError Code: ' . $th->getCode());
            Console::error($th->getMessage());

            if ($th instanceof AppwriteException) {
                throw $th;
            }
        } finally {
-            if ($type === 'function') {
-                $queueForFunctions
-                    ->setType(Func::TYPE_ASYNC_WRITE)
-                    ->setExecution($execution)
-                    ->setProject($project)
-                    ->trigger();
-            } elseif ($type === 'site') { // TODO: Move it to logs worker later
-                $dbForProject->createDocument('executions', $execution);
-            }
+            $queueForFunctions
+                ->setType(Func::TYPE_ASYNC_WRITE)
+                ->setExecution($execution)
+                ->setProject($project)
+                ->trigger();
        }

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

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

        $response
@@ -577,33 +434,24 @@ 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}', $resource->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS), 1)
+            ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS), 1)
            ->addMetric(METRIC_EXECUTIONS_COMPUTE, (int)($execution->getAttribute('duration') * 1000)) // per project
-            ->addMetric(str_replace('{functionInternalId}', $resource->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE), (int)($execution->getAttribute('duration') * 1000)) // per function
-            ->addMetric(METRIC_EXECUTIONS_MB_SECONDS, (int)(($spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT)))
-            ->addMetric(str_replace('{functionInternalId}', $resource->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS), (int)(($spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT)))
+            ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE), (int)($execution->getAttribute('duration') * 1000)) // per function
+            ->addMetric(METRIC_EXECUTIONS_MB_SECONDS, (int)(($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT)))
+            ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS), (int)(($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT)))
            ->setProject($project)
-            ->trigger();
+            ->trigger()
+        ;

        return true;
    } elseif ($type === 'api') {
        $utopia->getRoute()?->label('error', '');
        return false;
-    } elseif ($type === 'redirect') {
-        $url = $rule->getAttribute('redirectUrl', '');
-
-        $query = ($swooleRequest->server['query_string'] ?? '');
-        if (!empty($query)) {
-            $url .= '?' . $query;
-        }
-
-        $response->redirect($url, \intval($rule->getAttribute('redirectStatusCode', 301)));
-        return true;
    } else {
        throw new AppwriteException(AppwriteException::GENERAL_SERVER_ERROR, 'Unknown resource type ' . $type);
    }
@@ -612,6 +460,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
    return false;
 }

+/*
 App::init()
    ->groups(['api'])
    ->inject('project')
@@ -621,9 +470,10 @@ App::init()
            throw new AppwriteException(AppwriteException::GENERAL_BAD_REQUEST, 'Admin mode is not allowed for console project');
        }
    });
+*/

 App::init()
-    ->groups(['database', 'functions', 'sites', 'messaging'])
+    ->groups(['database', 'functions', 'storage', 'messaging'])
    ->inject('project')
    ->inject('request')
    ->action(function (Document $project, Request $request) {
@@ -649,14 +499,13 @@ App::init()
    ->inject('localeCodes')
    ->inject('clients')
    ->inject('geodb')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('queueForEvents')
    ->inject('queueForCertificates')
    ->inject('queueForFunctions')
    ->inject('isResourceBlocked')
    ->inject('previewHostname')
-    ->inject('apiKey')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, StatsUsage $queueForStatsUsage, Event $queueForEvents, Certificate $queueForCertificates, Func $queueForFunctions, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, Usage $queueForUsage, Event $queueForEvents, Certificate $queueForCertificates, Func $queueForFunctions, callable $isResourceBlocked, string $previewHostname) {
        /*
        * Appwrite Router
        */
@@ -664,8 +513,8 @@ App::init()
        $mainDomain = System::getEnv('_APP_DOMAIN', '');
        // Only run Router when external domain
        if ($host !== $mainDomain || !empty($previewHostname)) {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
-                $utopia->getRoute()?->label('router', true);
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname)) {
+                return;
            }
        }

@@ -692,9 +541,6 @@ App::init()
            if (version_compare($requestFormat, '1.6.0', '<')) {
                $request->addFilter(new RequestV18());
            }
-            if (version_compare($requestFormat, '1.7.0', '<')) {
-                $request->addFilter(new RequestV19());
-            }
        }

        $domain = $request->getHostname();
@@ -737,16 +583,14 @@ App::init()
                    }

                    if ($domainDocument->isEmpty()) {
-                        $ruleId = System::getEnv('_APP_RULES_FORMAT') === 'md5' ? md5($domain->get()) : ID::unique();
                        $domainDocument = new Document([
                            // TODO: @christyjacob remove once we migrate the rules in 1.7.x
-                            '$id' => $ruleId,
+                            '$id' => System::getEnv('_APP_RULES_FORMAT') === 'md5' ? md5($domain->get()) : ID::unique(),
                            'domain' => $domain->get(),
-                            'type' => 'api',
+                            'resourceType' => 'api',
                            'status' => 'verifying',
                            'projectId' => 'console',
-                            'projectInternalId' => 'console',
-                            'search' => implode(' ', [$ruleId, $domain->get()]),
+                            'projectInternalId' => 'console'
                        ]);

                        $domainDocument = $dbForPlatform->createDocument('rules', $domainDocument);
@@ -780,22 +624,6 @@ App::init()
        $validator = new Hostname($clients);
        if ($validator->isValid($origin)) {
            $refDomainOrigin = $origin;
-        } elseif (!empty($origin)) {
-            // Auto-allow domains with linked rule
-            if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
-                $rule = Authorization::skip(fn () => $dbForPlatform->getDocument('rules', md5($origin ?? '')));
-            } else {
-                $rule = Authorization::skip(
-                    fn () => $dbForPlatform->find('rules', [
-                        Query::equal('domain', [$origin]),
-                        Query::limit(1)
-                    ])
-                )[0] ?? new Document();
-            }
-
-            if (!$rule->isEmpty() && $rule->getAttribute('projectInternalId') === $project->getInternalId()) {
-                $refDomainOrigin = $origin;
-            }
        }

        $refDomain = (!empty($protocol) ? $protocol : $request->getProtocol()) . '://' . $refDomainOrigin . (!empty($port) ? ':' . $port : '');
@@ -844,11 +672,8 @@ App::init()
            if (version_compare($responseFormat, '1.6.0', '<')) {
                $response->addFilter(new ResponseV18());
            }
-            if (version_compare($responseFormat, '1.7.0', '<')) {
-                $response->addFilter(new ResponseV19());
-            }
            if (version_compare($responseFormat, 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");
            }
        }

@@ -907,14 +732,12 @@ App::options()
    ->inject('dbForPlatform')
    ->inject('getProjectDB')
    ->inject('queueForEvents')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('queueForFunctions')
    ->inject('geodb')
    ->inject('isResourceBlocked')
    ->inject('previewHostname')
-    ->inject('project')
-    ->inject('apiKey')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, Document $project, ?Key $apiKey) {
+    ->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
        */
@@ -922,8 +745,8 @@ App::options()
        $mainDomain = System::getEnv('_APP_DOMAIN', '');
        // Only run Router when external domain
        if ($host !== $mainDomain || !empty($previewHostname)) {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
-                $utopia->getRoute()?->label('router', true);
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname)) {
+                return;
            }
        }

@@ -937,16 +760,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()
@@ -957,8 +770,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);
@@ -1035,9 +848,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();
@@ -1059,10 +874,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');
@@ -1070,17 +882,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 */
@@ -1208,7 +1021,6 @@ App::error()
                ->setParam('trace', $output['trace'] ?? []);

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

        $response->dynamic(
@@ -1228,13 +1040,12 @@ App::get('/robots.txt')
    ->inject('dbForPlatform')
    ->inject('getProjectDB')
    ->inject('queueForEvents')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('queueForFunctions')
    ->inject('geodb')
    ->inject('isResourceBlocked')
    ->inject('previewHostname')
-    ->inject('apiKey')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
        $host = $request->getHostname() ?? '';
        $mainDomain = System::getEnv('_APP_DOMAIN', '');

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

@@ -1259,13 +1068,12 @@ App::get('/humans.txt')
    ->inject('dbForPlatform')
    ->inject('getProjectDB')
    ->inject('queueForEvents')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('queueForFunctions')
    ->inject('geodb')
    ->inject('isResourceBlocked')
    ->inject('previewHostname')
-    ->inject('apiKey')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
        $host = $request->getHostname() ?? '';
        $mainDomain = System::getEnv('_APP_DOMAIN', '');

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

@@ -1337,27 +1143,12 @@ App::get('/v1/ping')
    ->desc('Test the connection between the Appwrite and the SDK.')
    ->label('scope', 'global')
    ->label('event', 'projects.[projectId].ping')
-    ->label('sdk', new Method(
-        namespace: 'ping',
-        name: 'get',
-        hide: true,
-        description: <<<EOT
-        Send a ping to project as part of onboarding.
-        EOT,
-        auth: [],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_ANY,
-            )
-        ],
-    ))
    ->inject('response')
    ->inject('project')
    ->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);
        }

@@ -1379,34 +1170,6 @@ App::get('/v1/ping')
        $response->text('Pong!');
    });

-// Preview authorization
-App::get('/_appwrite/authorize')
-    ->inject('request')
-    ->inject('response')
-    ->inject('previewHostname')
-    ->action(function (Request $request, Response $response, string $previewHostname) {
-
-        $host = $request->getHostname() ?? '';
-        if (!empty($previewHostname)) {
-            $host = $previewHostname;
-        }
-
-        $referrer = $request->getReferer();
-        $protocol = \parse_url($request->getOrigin($referrer), PHP_URL_SCHEME);
-
-        $jwt = $request->getParam('jwt', '');
-        $path = $request->getParam('path', '');
-
-        $duration = 60 * 60 * 24; // 1 day in seconds
-        $expire = DateTime::formatTz(DateTime::addSeconds(new \DateTime(), $duration));
-
-        $response
-            ->addCookie(Auth::$cookieNamePreview, $jwt, (new \DateTime($expire))->getTimestamp(), '/', $host, ('https' === $protocol), true, null)
-            ->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
-            ->addHeader('Pragma', 'no-cache')
-            ->redirect($protocol . '://' . $host . $path);
-    });
-
 App::wildcard()
    ->groups(['api'])
    ->label('scope', 'global')
@@ -1415,15 +1178,9 @@ App::wildcard()
    });

 foreach (Config::getParam('services', []) as $service) {
-    if (!empty($service['controller'])) {
-        include_once $service['controller'];
-    }
+    include_once $service['controller'];
 }

-// Modules
-$platform = new Appwrite();
-$platform->init(Service::TYPE_HTTP);
-
 // Check for any errors found while we were initialising the SDK Methods.
 if (!empty(Method::getErrors())) {
    throw new \Exception('Errors found during SDK initialization:' . PHP_EOL . implode(PHP_EOL, Method::getErrors()));
@@ -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;
@@ -28,7 +28,7 @@ use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Validator\Authorization;
-use Utopia\Queue\Publisher;
+use Utopia\Queue\Connection;
 use Utopia\System\System;
 use Utopia\Validator\WhiteList;

@@ -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,81 +98,80 @@ $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
-                    ->addReduce($document);
-            }
-            break;
-        case $document->getCollection() === 'sites':
-            $queueForStatsUsage
-                ->addMetric(METRIC_SITES, $value); // per project
-
-            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForStatsUsage
+                $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
@@ -196,79 +195,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());
                        }
                    }
@@ -276,7 +313,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 = [];
@@ -292,7 +330,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']);
            }
@@ -307,7 +345,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) {
@@ -316,7 +356,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) {
@@ -330,18 +372,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]
@@ -351,13 +393,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);
        }
@@ -387,19 +429,18 @@ App::init()
    ->inject('response')
    ->inject('project')
    ->inject('user')
-    ->inject('publisher')
+    ->inject('queue')
    ->inject('queueForEvents')
    ->inject('queueForMessaging')
    ->inject('queueForAudits')
    ->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, Connection $queue, 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();

@@ -430,7 +471,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;
        }

@@ -496,12 +537,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);
@@ -509,14 +544,14 @@ App::init()

        // Clone the queues, to prevent events triggered by the database listener
        // from overwriting the events that are supposed to be triggered in the shutdown hook.
-        $queueForEventsClone = new Event($publisher);
-        $queueForFunctions = new Func($publisher);
-        $queueForWebhooks = new Webhook($publisher);
+        $queueForEventsClone = new Event($queue);
+        $queueForFunctions = new Func($queue);
+        $queueForWebhooks = new Webhook($queue);
        $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,
@@ -543,9 +578,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);
                    }

@@ -569,13 +607,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));
                    }
                }

@@ -589,7 +625,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')
+                ;
            }
        }
    });
@@ -657,7 +694,7 @@ App::shutdown()
    ->inject('user')
    ->inject('queueForEvents')
    ->inject('queueForAudits')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('queueForDeletes')
    ->inject('queueForDatabase')
    ->inject('queueForBuilds')
@@ -666,7 +703,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();

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

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

-        // Cache label
+        /**
+         * Cache label
+         */
        $useCache = $route->getLabel('cache', false);
        if ($useCache) {
            $resource = $resourceType = null;
@@ -822,13 +860,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();
        }
@@ -13,11 +13,11 @@ use Swoole\Table;
 use Utopia\App;
 use Utopia\Audit\Audit;
 use Utopia\CLI\Console;
-use Utopia\Compression\Compression;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
+use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
@@ -29,8 +29,6 @@ use Utopia\Pools\Group;
 use Utopia\Swoole\Files;
 use Utopia\System\System;

-Files::load(__DIR__.'/../public');
-
 const DOMAIN_SYNC_TIMER = 30; // 30 seconds

 $domains = new Table(1_000_000); // 1 million rows
@@ -158,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');

@@ -239,120 +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::COLLECTION)->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()) {
-                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.');
            }

-            if (Authorization::skip(fn () => $dbForPlatform->getDocument('buckets', 'screenshots')->isEmpty())) {
-                Console::info("    └── Creating screenshots bucket...");
-                Authorization::skip(fn () => $dbForPlatform->createDocument('buckets', new Document([
-                    '$id' => ID::custom('screenshots'),
-                    '$collection' => ID::custom('buckets'),
-                    'name' => 'Screenshots',
-                    'maximumFileSize' => 5000000, // ~5MB
-                    'allowedFileExtensions' => [ 'png' ],
-                    'enabled' => true,
-                    'compression' => Compression::GZIP,
-                    'encryption' => false,
-                    'antivirus' => false,
-                    'fileSecurity' => true,
-                    '$permissions' => [],
-                    'search' => 'buckets Screenshots',
-                ])));
+            $attributes = \array_map(fn ($attribute) => new Document($attribute), $files['attributes']);
+            $indexes = \array_map(fn (array $index) => new Document($index), $files['indexes']);

-                $bucket = Authorization::skip(fn () => $dbForPlatform->getDocument('buckets', 'screenshots'));
-
-                Console::info("    └── Creating files collection for screenshots bucket...");
-                $files = $collections['buckets']['files'] ?? [];
-                if (empty($files)) {
-                    throw new Exception('Files collection is not configured.');
-                }
-
-                $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']);
-
-                $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']);
-
-                Authorization::skip(fn () => $dbForPlatform->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes));
-            }
-        });
+            $dbForPlatform->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes);
+        }

        $projectCollections = $collections['projects'];
        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
@@ -380,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::COLLECTION)->isEmpty()) {
-                $audit = new Audit($dbForProject);
-                $audit->setup();
-            }
-
            foreach ($projectCollections as $key => $collection) {
                if (($collection['$collection'] ?? '') !== Database::METADATA) {
                    continue;
@@ -403,6 +297,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
        }

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

@@ -564,6 +459,7 @@ $http->on('Task', function () use ($register, $domains) {
                if ($lastSyncUpdate != null) {
                    $queries[] = Query::greaterThanEqual('$updatedAt', $lastSyncUpdate);
                }
+                $queries[] = Query::equal('resourceType', ['function']);
                $results = [];
                try {
                    $results = Authorization::skip(fn () =>  $dbForPlatform->find('rules', $queries));
@@ -574,7 +470,7 @@ $http->on('Task', function () use ($register, $domains) {
                $sum = count($results);
                foreach ($results as $document) {
                    $domain = $document->getAttribute('domain');
-                    if (str_ends_with($domain, System::getEnv('_APP_DOMAIN_FUNCTIONS')) || str_ends_with($domain, System::getEnv('_APP_DOMAIN_SITES'))) {
+                    if (str_ends_with($domain, System::getEnv('_APP_DOMAIN_FUNCTIONS'))) {
                        continue;
                    }
                    $domains->set(md5($domain), ['value' => 1]);
@@ -21,7 +21,6 @@ if (\file_exists(__DIR__ . '/../vendor/autoload.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;
@@ -33,16 +32,16 @@ use Appwrite\Event\Mail;
 use Appwrite\Event\Messaging;
 use Appwrite\Event\Migration;
 use Appwrite\Event\Realtime;
-use Appwrite\Event\StatsUsage;
+use Appwrite\Event\Usage;
 use Appwrite\Event\Webhook;
 use Appwrite\Extend\Exception;
+use Appwrite\Functions\Specification;
 use Appwrite\GraphQL\Promises\Adapter\Swoole;
 use Appwrite\GraphQL\Schema;
 use Appwrite\Hooks\Hooks;
 use Appwrite\Network\Validator\Email;
 use Appwrite\Network\Validator\Origin;
 use Appwrite\OpenSSL\OpenSSL;
-use Appwrite\Platform\Modules\Compute\Specification;
 use Appwrite\PubSub\Adapter\Redis as PubSub;
 use Appwrite\URL\URL as AppwriteURL;
 use Appwrite\Utopia\Request;
@@ -78,6 +77,7 @@ use Utopia\Logger\Logger;
 use Utopia\Pools\Group;
 use Utopia\Pools\Pool;
 use Utopia\Queue;
+use Utopia\Queue\Connection;
 use Utopia\Registry\Registry;
 use Utopia\Storage\Device;
 use Utopia\Storage\Device\Backblaze;
@@ -125,7 +125,7 @@ const APP_PROJECT_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_FILE_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
 const APP_CACHE_BUSTER = 4318;
-const APP_VERSION_STABLE = '1.7.0';
+const APP_VERSION_STABLE = '1.6.1';
 const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
 const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
 const APP_DATABASE_ATTRIBUTE_IP = 'ip';
@@ -137,7 +137,6 @@ const APP_DATABASE_ATTRIBUTE_STRING_MAX_LENGTH = 1_073_741_824; // 2^32 bits / 4
 const APP_DATABASE_TIMEOUT_MILLISECONDS = 15_000;
 const APP_DATABASE_QUERY_MAX_VALUES = 500;
 const APP_STORAGE_UPLOADS = '/storage/uploads';
-const APP_STORAGE_SITES = '/storage/sites';
 const APP_STORAGE_FUNCTIONS = '/storage/functions';
 const APP_STORAGE_BUILDS = '/storage/builds';
 const APP_STORAGE_CACHE = '/storage/cache';
@@ -156,9 +155,9 @@ const APP_SOCIAL_DEV = 'https://dev.to/appwrite';
 const APP_SOCIAL_STACKSHARE = 'https://stackshare.io/appwrite';
 const APP_SOCIAL_YOUTUBE = 'https://www.youtube.com/c/appwrite?sub_confirmation=1';
 const APP_HOSTNAME_INTERNAL = 'appwrite';
-const APP_COMPUTE_CPUS_DEFAULT = 0.5;
-const APP_COMPUTE_MEMORY_DEFAULT = 512;
-const APP_COMPUTE_SPECIFICATION_DEFAULT = Specification::S_1VCPU_512MB;
+const APP_FUNCTION_SPECIFICATION_DEFAULT = Specification::S_1VCPU_512MB;
+const APP_FUNCTION_CPUS_DEFAULT = 0.5;
+const APP_FUNCTION_MEMORY_DEFAULT = 512;
 const APP_PLATFORM_SERVER = 'server';
 const APP_PLATFORM_CLIENT = 'client';
 const APP_PLATFORM_CONSOLE = 'console';
@@ -184,7 +183,6 @@ const DELETE_TYPE_DATABASES = 'databases';
 const DELETE_TYPE_DOCUMENT = 'document';
 const DELETE_TYPE_COLLECTIONS = 'collections';
 const DELETE_TYPE_PROJECTS = 'projects';
-const DELETE_TYPE_SITES = 'sites';
 const DELETE_TYPE_FUNCTIONS = 'functions';
 const DELETE_TYPE_DEPLOYMENTS = 'deployments';
 const DELETE_TYPE_USERS = 'users';
@@ -240,6 +238,8 @@ 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';
@@ -270,11 +270,8 @@ 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_SITES = 'sites';
 const METRIC_FUNCTIONS  = 'functions';
 const METRIC_DEPLOYMENTS  = 'deployments';
 const METRIC_DEPLOYMENTS_STORAGE  = 'deployments.storage';
@@ -293,52 +290,23 @@ const METRIC_FUNCTION_ID_BUILDS_STORAGE = '{functionInternalId}.builds.storage';
 const METRIC_FUNCTION_ID_BUILDS_COMPUTE  = '{functionInternalId}.builds.compute';
 const METRIC_FUNCTION_ID_BUILDS_COMPUTE_SUCCESS  = '{functionInternalId}.builds.compute.success';
 const METRIC_FUNCTION_ID_BUILDS_COMPUTE_FAILED  = '{functionInternalId}.builds.compute.failed';
-const METRIC_FUNCTION_ID_BUILDS_MB_SECONDS = '{functionInternalId}.builds.mbSeconds';
-const METRIC_SITES_ID_BUILDS  = 'sites.{siteInternalId}.builds';
-const METRIC_SITES_ID_BUILDS_SUCCESS  = 'sites.{siteInternalId}.builds.success';
-const METRIC_SITES_ID_BUILDS_FAILED  = 'sites.{siteInternalId}.builds.failed';
-const METRIC_SITES_ID_BUILDS_STORAGE = 'sites.{siteInternalId}.builds.storage';
-const METRIC_SITES_ID_BUILDS_COMPUTE  = 'sites.{siteInternalId}.builds.compute';
-const METRIC_SITES_ID_BUILDS_COMPUTE_SUCCESS  = 'sites.{siteInternalId}.builds.compute.success';
-const METRIC_SITES_ID_BUILDS_COMPUTE_FAILED  = 'sites.{siteInternalId}.builds.compute.failed';
-const METRIC_SITES_ID_BUILDS_MB_SECONDS = 'sites.{siteInternalId}.builds.mbSeconds';
 const METRIC_FUNCTION_ID_DEPLOYMENTS  = '{resourceType}.{resourceInternalId}.deployments';
 const METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE  = '{resourceType}.{resourceInternalId}.deployments.storage';
+const METRIC_FUNCTION_ID_BUILDS_MB_SECONDS = '{functionInternalId}.builds.mbSeconds';
 const METRIC_EXECUTIONS  = 'executions';
 const METRIC_EXECUTIONS_COMPUTE  = 'executions.compute';
 const METRIC_EXECUTIONS_MB_SECONDS = 'executions.mbSeconds';
 const METRIC_FUNCTION_ID_EXECUTIONS  = '{functionInternalId}.executions';
 const METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE  = '{functionInternalId}.executions.compute';
 const METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS = '{functionInternalId}.executions.mbSeconds';
-const METRIC_SITE_ID_DEPLOYMENTS  = '{resourceType}.{resourceInternalId}.deployments';
-const METRIC_SITE_ID_DEPLOYMENTS_STORAGE = '{resourceType}.{resourceInternalId}.deployments.storage';
-const METRIC_SITE_ID_BUILDS  = '{siteInternalId}.builds';
-const METRIC_SITE_ID_BUILDS_STORAGE = '{siteInternalId}.builds.storage';
-const METRIC_SITE_ID_BUILDS_COMPUTE  = '{siteInternalId}.builds.compute';
-const METRIC_SITE_ID_BUILDS_MB_SECONDS = '{siteInternalId}.builds.mbSeconds';
 const METRIC_NETWORK_REQUESTS  = 'network.requests';
 const METRIC_NETWORK_INBOUND  = 'network.inbound';
 const METRIC_NETWORK_OUTBOUND  = 'network.outbound';
-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_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_SITES = 'sites';
 const RESOURCE_TYPE_DATABASES = 'databases';
 const RESOURCE_TYPE_BUCKETS = 'buckets';
 const RESOURCE_TYPE_PROVIDERS = 'providers';
@@ -359,16 +327,13 @@ if (!App::isProduction()) {
 /*
 * ENV vars
 */
-Config::load('template-runtimes', __DIR__ . '/config/template-runtimes.php');
 Config::load('events', __DIR__ . '/config/events.php');
 Config::load('auth', __DIR__ . '/config/auth.php');
 Config::load('apis', __DIR__ . '/config/apis.php');  // List of APIs
 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('frameworks', __DIR__ . '/config/frameworks.php');
 Config::load('runtimes', __DIR__ . '/config/runtimes.php');
 Config::load('runtimes-v2', __DIR__ . '/config/runtimes-v2.php');
 Config::load('usage', __DIR__ . '/config/usage.php');
@@ -392,9 +357,8 @@ 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('specifications', __DIR__ . '/config/specifications.php');
-Config::load('templates-function', __DIR__ . '/config/templates/function.php');
-Config::load('templates-site', __DIR__ . '/config/templates/site.php');
+Config::load('runtime-specifications', __DIR__ . '/config/runtimes/specifications.php');
+Config::load('function-templates', __DIR__ . '/config/function-templates.php');

 /**
 * New DB Filters
@@ -617,7 +581,7 @@ Database::addFilter(
        return $database
            ->find('variables', [
                Query::equal('resourceInternalId', [$document->getInternalId()]),
-                Query::equal('resourceType', ['function', 'site']),
+                Query::equal('resourceType', ['function']),
                Query::limit(APP_LIMIT_SUBQUERY),
            ]);
    }
@@ -839,10 +803,6 @@ $register->set('logger', function () {
    $providerName = System::getEnv('_APP_LOGGING_PROVIDER', '');
    $providerConfig = System::getEnv('_APP_LOGGING_CONFIG', '');

-    if (empty($providerConfig)) {
-        return;
-    }
-
    try {
        $loggingProvider = new DSN($providerConfig ?? '');

@@ -930,14 +890,8 @@ $register->set('pools', function () {
            'multiple' => false,
            'schemes' => ['mariadb', 'mysql'],
        ],
-        'publisher' => [
-            'type' => 'publisher',
-            'dsns' => $fallbackForRedis,
-            'multiple' => false,
-            'schemes' => ['redis'],
-        ],
-        'consumer' => [
-            'type' => 'consumer',
+        'queue' => [
+            'type' => 'queue',
            'dsns' => $fallbackForRedis,
            'multiple' => false,
            'schemes' => ['redis'],
@@ -1045,26 +999,31 @@ $register->set('pools', function () {
                        };

                        $adapter->setDatabase($dsn->getPath());
-                        return $adapter;
+                        break;
                    case 'pubsub':
-                        return match ($dsn->getScheme()) {
+                        $adapter = 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())),
+                        break;
+                    case 'queue':
+                        $adapter = match ($dsn->getScheme()) {
+                            'redis' => new Queue\Connection\Redis($dsn->getHost(), $dsn->getPort()),
                            default => null
                        };
+                        break;
                    case 'cache':
-                        return match ($dsn->getScheme()) {
+                        $adapter = match ($dsn->getScheme()) {
                            'redis' => new RedisCache($resource()),
                            default => null
                        };
+                        break;
+
                    default:
                        throw new Exception(Exception::GENERAL_SERVER_ERROR, "Server error: Missing adapter implementation.");
                }
+
+                return $adapter;
            });

            $group->add($pool);
@@ -1187,51 +1146,48 @@ App::setResource('localeCodes', function () {
 });

 // Queues
-App::setResource('publisher', function (Group $pools) {
-    return $pools->get('publisher')->pop()->getResource();
+App::setResource('queue', function (Group $pools) {
+    return $pools->get('queue')->pop()->getResource();
 }, ['pools']);
-App::setResource('consumer', function (Group $pools) {
-    return $pools->get('consumer')->pop()->getResource();
-}, ['pools']);
-App::setResource('queueForMessaging', function (Queue\Publisher $publisher) {
-    return new Messaging($publisher);
-}, ['publisher']);
-App::setResource('queueForMails', function (Queue\Publisher $publisher) {
-    return new Mail($publisher);
-}, ['publisher']);
-App::setResource('queueForBuilds', function (Queue\Publisher $publisher) {
-    return new Build($publisher);
-}, ['publisher']);
-App::setResource('queueForDatabase', function (Queue\Publisher $publisher) {
-    return new EventDatabase($publisher);
-}, ['publisher']);
-App::setResource('queueForDeletes', function (Queue\Publisher $publisher) {
-    return new Delete($publisher);
-}, ['publisher']);
-App::setResource('queueForEvents', function (Queue\Publisher $publisher) {
-    return new Event($publisher);
-}, ['publisher']);
-App::setResource('queueForWebhooks', function (Queue\Publisher $publisher) {
-    return new Webhook($publisher);
-}, ['publisher']);
+App::setResource('queueForMessaging', function (Connection $queue) {
+    return new Messaging($queue);
+}, ['queue']);
+App::setResource('queueForMails', function (Connection $queue) {
+    return new Mail($queue);
+}, ['queue']);
+App::setResource('queueForBuilds', function (Connection $queue) {
+    return new Build($queue);
+}, ['queue']);
+App::setResource('queueForDatabase', function (Connection $queue) {
+    return new EventDatabase($queue);
+}, ['queue']);
+App::setResource('queueForDeletes', function (Connection $queue) {
+    return new Delete($queue);
+}, ['queue']);
+App::setResource('queueForEvents', function (Connection $queue) {
+    return new Event($queue);
+}, ['queue']);
+App::setResource('queueForWebhooks', function (Connection $queue) {
+    return new Webhook($queue);
+}, ['queue']);
 App::setResource('queueForRealtime', function () {
    return new Realtime();
 }, []);
-App::setResource('queueForStatsUsage', function (Queue\Publisher $publisher) {
-    return new StatsUsage($publisher);
-}, ['publisher']);
-App::setResource('queueForAudits', function (Queue\Publisher $publisher) {
-    return new Audit($publisher);
-}, ['publisher']);
-App::setResource('queueForFunctions', function (Queue\Publisher $publisher) {
-    return new Func($publisher);
-}, ['publisher']);
-App::setResource('queueForCertificates', function (Queue\Publisher $publisher) {
-    return new Certificate($publisher);
-}, ['publisher']);
-App::setResource('queueForMigrations', function (Queue\Publisher $publisher) {
-    return new Migration($publisher);
-}, ['publisher']);
+App::setResource('queueForAudits', function (Connection $queue) {
+    return new Audit($queue);
+}, ['queue']);
+App::setResource('queueForFunctions', function (Connection $queue) {
+    return new Func($queue);
+}, ['queue']);
+App::setResource('queueForUsage', function (Connection $queue) {
+    return new Usage($queue);
+}, ['queue']);
+App::setResource('queueForCertificates', function (Connection $queue) {
+    return new Certificate($queue);
+}, ['queue']);
+App::setResource('queueForMigrations', function (Connection $queue) {
+    return new Migration($queue);
+}, ['queue']);
 App::setResource('clients', function ($request, $console, $project) {
    $console->setAttribute('platforms', [ // Always allow current host
        '$collection' => ID::custom('platforms'),
@@ -1430,7 +1386,45 @@ App::setResource('session', function (Document $user) {
 }, ['user']);

 App::setResource('console', function () {
-    return new Document(Config::getParam('console'));
+    return new Document([
+        '$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
+        ],
+        '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', '')
+        ],
+    ]);
 }, []);

 App::setResource('dbForProject', function (Group $pools, Database $dbForPlatform, Cache $cache, Document $project) {
@@ -1549,39 +1543,6 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform
    };
 }, ['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)
-            ->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 = [];
@@ -1626,10 +1587,6 @@ App::setResource('deviceForFiles', function ($project) {
    return getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId());
 }, ['project']);

-App::setResource('deviceForSites', function ($project) {
-    return getDevice(APP_STORAGE_SITES . '/app-' . $project->getId());
-}, ['project']);
-
 App::setResource('deviceForFunctions', function ($project) {
    return getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId());
 }, ['project']);
@@ -1649,7 +1606,6 @@ function getDevice(string $root, string $connection = ''): Device
        $accessSecret = '';
        $bucket = '';
        $region = '';
-        $url = App::getEnv('_APP_STORAGE_S3_ENDPOINT', '');

        try {
            $dsn = new DSN($connection);
@@ -1664,7 +1620,7 @@ function getDevice(string $root, string $connection = ''): Device

        switch ($device) {
            case Storage::DEVICE_S3:
-                return new S3($root, $accessKey, $accessSecret, $bucket, $region, $acl, $url);
+                return new S3($root, $accessKey, $accessSecret, $bucket, $region, $acl);
            case STORAGE::DEVICE_DO_SPACES:
                $device = new DOSpaces($root, $accessKey, $accessSecret, $bucket, $region, $acl);
                $device->setHttpVersion(S3::HTTP_VERSION_1_1);
@@ -1690,8 +1646,7 @@ function getDevice(string $root, string $connection = ''): Device
                $s3Region = System::getEnv('_APP_STORAGE_S3_REGION', '');
                $s3Bucket = System::getEnv('_APP_STORAGE_S3_BUCKET', '');
                $s3Acl = 'private';
-                $s3EndpointUrl = App::getEnv('_APP_STORAGE_S3_ENDPOINT', '');
-                return new S3($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl, $s3EndpointUrl);
+                return new S3($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl);
            case Storage::DEVICE_DO_SPACES:
                $doSpacesAccessKey = System::getEnv('_APP_STORAGE_DO_SPACES_ACCESS_KEY', '');
                $doSpacesSecretKey = System::getEnv('_APP_STORAGE_DO_SPACES_SECRET', '');
@@ -1926,32 +1881,13 @@ App::setResource(
    fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false
 );

-App::setResource('previewHostname', function (Request $request, ?Key $apiKey) {
-    $allowed = false;
-
+App::setResource('previewHostname', function (Request $request) {
    if (App::isDevelopment()) {
-        $allowed = true;
-    } elseif (!\is_null($apiKey) && $apiKey->getHostnameOverride() === true) {
-        $allowed = true;
-    }
-
-    if ($allowed) {
-        $host = $request->getQuery('appwrite-hostname', $request->getHeader('x-appwrite-hostname', ''));
+        $host = $request->getQuery('appwrite-hostname') ?? '';
        if (!empty($host)) {
            return $host;
        }
    }

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

  appwrite-console:
    <<: *x-logging
@@ -321,7 +321,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
@@ -404,20 +403,19 @@ $image = $this->getParam('image', '');
      - _APP_VCS_GITHUB_APP_NAME
      - _APP_VCS_GITHUB_PRIVATE_KEY
      - _APP_VCS_GITHUB_APP_ID
-      - _APP_COMPUTE_TIMEOUT
-      - _APP_COMPUTE_BUILD_TIMEOUT
-      - _APP_COMPUTE_CPUS
-      - _APP_COMPUTE_MEMORY
-      - _APP_COMPUTE_SIZE_LIMIT
+      - _APP_FUNCTIONS_TIMEOUT
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
+      - _APP_FUNCTIONS_SIZE_LIMIT
      - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_COMPUTE_FORCE_HTTPS
+      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
      - _APP_DOMAIN
      - _APP_STORAGE_DEVICE
      - _APP_STORAGE_S3_ACCESS_KEY
      - _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
@@ -495,10 +493,10 @@ $image = $this->getParam('image', '');
      - _APP_DB_SCHEMA
      - _APP_DB_USER
      - _APP_DB_PASS
-      - _APP_COMPUTE_TIMEOUT
-      - _APP_COMPUTE_BUILD_TIMEOUT
-      - _APP_COMPUTE_CPUS
-      - _APP_COMPUTE_MEMORY
+      - _APP_FUNCTIONS_TIMEOUT
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
      - _APP_USAGE_STATS
@@ -573,7 +571,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
@@ -655,69 +652,10 @@ $image = $this->getParam('image', '');
      - _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:
@@ -742,11 +680,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
@@ -861,7 +799,7 @@ $image = $this->getParam('image', '');
    <<: *x-logging
    restart: unless-stopped
    stop_signal: SIGINT
-    image: openruntimes/executor:0.7.0
+    image: openruntimes/executor:0.6.11
    networks:
      - appwrite
      - runtimes
@@ -873,9 +811,9 @@ $image = $this->getParam('image', '');
      # It's not possible to share mount file between 2 containers without host mount (copying is too slow)
      - /tmp:/tmp:rw
    environment:
-      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_COMPUTE_INACTIVE_THRESHOLD
-      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_COMPUTE_MAINTENANCE_INTERVAL
-      - OPR_EXECUTOR_NETWORK=$_APP_COMPUTE_RUNTIMES_NETWORK
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_FUNCTIONS_INACTIVE_THRESHOLD
+      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_FUNCTIONS_MAINTENANCE_INTERVAL
+      - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
      - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD
      - OPR_EXECUTOR_ENV=$_APP_ENV
@@ -887,7 +825,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,12 +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;
-/** remove */
-/** /remove */
-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;
@@ -35,8 +31,8 @@ use Utopia\Logger\Log;
 use Utopia\Logger\Logger;
 use Utopia\Platform\Service;
 use Utopia\Pools\Group;
+use Utopia\Queue\Connection;
 use Utopia\Queue\Message;
-use Utopia\Queue\Publisher;
 use Utopia\Queue\Server;
 use Utopia\Registry\Registry;
 use Utopia\System\System;
@@ -177,39 +173,6 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatf
    };
 }, ['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)
-            ->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);
 });
@@ -261,69 +224,57 @@ Server::setResource('timelimit', function (\Redis $redis) {

 Server::setResource('log', fn () => new Log());

-Server::setResource('publisher', function (Group $pools) {
-    return $pools->get('publisher')->pop()->getResource();
+Server::setResource('queueForUsage', function (Connection $queue) {
+    return new Usage($queue);
+}, ['queue']);
+
+Server::setResource('queueForUsageDump', function (Connection $queue) {
+    return new UsageDump($queue);
+}, ['queue']);
+
+Server::setResource('queue', function (Group $pools) {
+    return $pools->get('queue')->pop()->getResource();
 }, ['pools']);

-Server::setResource('consumer', function (Group $pools) {
-    return $pools->get('consumer')->pop()->getResource();
-}, ['pools']);
+Server::setResource('queueForDatabase', function (Connection $queue) {
+    return new EventDatabase($queue);
+}, ['queue']);

-Server::setResource('queueForStatsUsage', function (Publisher $publisher) {
-    return new StatsUsage($publisher);
-}, ['publisher']);
+Server::setResource('queueForMessaging', function (Connection $queue) {
+    return new Messaging($queue);
+}, ['queue']);

-Server::setResource('queueForStatsUsageDump', function (Publisher $publisher) {
-    return new StatsUsageDump($publisher);
-}, ['publisher']);
+Server::setResource('queueForMails', function (Connection $queue) {
+    return new Mail($queue);
+}, ['queue']);

-Server::setResource('queueForDatabase', function (Publisher $publisher) {
-    return new EventDatabase($publisher);
-}, ['publisher']);
+Server::setResource('queueForBuilds', function (Connection $queue) {
+    return new Build($queue);
+}, ['queue']);

-Server::setResource('queueForMessaging', function (Publisher $publisher) {
-    return new Messaging($publisher);
-}, ['publisher']);
+Server::setResource('queueForDeletes', function (Connection $queue) {
+    return new Delete($queue);
+}, ['queue']);

-Server::setResource('queueForMails', function (Publisher $publisher) {
-    return new Mail($publisher);
-}, ['publisher']);
+Server::setResource('queueForEvents', function (Connection $queue) {
+    return new Event($queue);
+}, ['queue']);

-Server::setResource('queueForBuilds', function (Publisher $publisher) {
-    return new Build($publisher);
-}, ['publisher']);
+Server::setResource('queueForAudits', function (Connection $queue) {
+    return new Audit($queue);
+}, ['queue']);

-Server::setResource('queueForDeletes', function (Publisher $publisher) {
-    return new Delete($publisher);
-}, ['publisher']);
+Server::setResource('queueForFunctions', function (Connection $queue) {
+    return new Func($queue);
+}, ['queue']);

-Server::setResource('queueForEvents', function (Publisher $publisher) {
-    return new Event($publisher);
-}, ['publisher']);
+Server::setResource('queueForCertificates', function (Connection $queue) {
+    return new Certificate($queue);
+}, ['queue']);

-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']);
-
-Server::setResource('queueForMigrations', function (Publisher $publisher) {
-    return new Migration($publisher);
-}, ['publisher']);
+Server::setResource('queueForMigrations', function (Connection $queue) {
+    return new Migration($queue);
+}, ['queue']);

 Server::setResource('logger', function (Registry $register) {
    return $register->get('logger');
@@ -333,10 +284,6 @@ Server::setResource('pools', function (Registry $register) {
    return $register->get('pools');
 }, ['register']);

-Server::setResource('deviceForSites', function (Document $project) {
-    return getDevice(APP_STORAGE_SITES . '/app-' . $project->getId());
-}, ['project']);
-
 Server::setResource('deviceForFunctions', function (Document $project) {
    return getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId());
 }, ['project']);
@@ -439,7 +386,7 @@ try {
     */
    $platform->init(Service::TYPE_WORKER, [
        'workersNum' => System::getEnv('_APP_WORKERS_NUM', 1),
-        'connection' => $pools->get('consumer')->pop()->getResource(),
+        'connection' => $pools->get('queue')->pop()->getResource(),
        'workerName' => strtolower($workerName) ?? null,
        'queueName' => $queueName
    ]);
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-php /usr/src/code/app/cli.php screenshot $@
@@ -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,8 +14,7 @@
        "test": "vendor/bin/phpunit",
        "lint": "vendor/bin/pint --test",
        "format": "vendor/bin/pint",
-        "bench": "vendor/bin/phpbench run --report=benchmark",
-        "check": "./vendor/bin/phpstan analyse -c phpstan.neon"
+        "bench": "vendor/bin/phpbench run --report=benchmark"
    },
    "autoload": {
        "psr-4": {
@@ -31,7 +30,7 @@
        }
    },
    "require": {
-        "php": ">=8.0.0",
+        "php": ">=8.3",
        "ext-curl": "*",
        "ext-imagick": "*",
        "ext-mbstring": "*",
@@ -44,36 +43,35 @@
        "ext-openssl": "*",
        "ext-zlib": "*",
        "ext-sockets": "*",
-        "appwrite/php-runtimes": "0.18.*",
+        "appwrite/php-runtimes": "0.16.*",
        "appwrite/php-clamav": "2.0.*",
-        "utopia-php/abuse": "0.51.*",
+        "utopia-php/abuse": "0.47.*",
        "utopia-php/analytics": "0.10.*",
-        "utopia-php/audit": "0.54.0",
-        "utopia-php/cache": "0.12.*",
+        "utopia-php/audit": "0.47.*",
+        "utopia-php/cache": "0.11.*",
        "utopia-php/cli": "0.15.*",
        "utopia-php/config": "0.2.*",
-        "utopia-php/detector": "0.1.*",
-        "utopia-php/database": "0.60.*",
+        "utopia-php/database": "0.56.4",
        "utopia-php/domains": "0.5.*",
        "utopia-php/dsn": "0.2.1",
        "utopia-php/framework": "0.33.*",
        "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/messaging": "0.14.*",
        "utopia-php/migration": "0.6.*",
        "utopia-php/orchestration": "0.9.*",
-        "utopia-php/platform": "0.7.3",
+        "utopia-php/platform": "0.7.1",
        "utopia-php/pools": "0.5.*",
        "utopia-php/preloader": "0.2.*",
-        "utopia-php/queue": "0.8.*",
+        "utopia-php/queue": "0.7.*",
        "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",
@@ -86,13 +84,12 @@
    },
    "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",
-        "phpstan/phpstan": "1.8.*",
-        "textalk/websocket": "1.5.*",
-        "laravel/pint": "1.*",
-        "phpbench/phpbench": "1.*"
+        "textalk/websocket": "1.5.7",
+        "laravel/pint": "^1.14",
+        "phpbench/phpbench": "^1.2"
    },
    "provide": {
        "ext-phpiredis": "*"
@@ -102,8 +99,8 @@
            "php": "8.3"
        },
        "allow-plugins": {
-            "php-http/discovery": true,
-            "tbachert/spi": true
+            "php-http/discovery": false,
+            "tbachert/spi": false
        }
    }
 }
@@ -76,8 +76,6 @@ services:
      - appwrite-config:/storage/config:rw
      - appwrite-certificates:/storage/certificates:rw
      - appwrite-functions:/storage/functions:rw
-      - appwrite-sites:/storage/sites:rw
-      - appwrite-builds:/storage/builds:rw
      - ./phpunit.xml:/usr/src/code/phpunit.xml
      - ./tests:/usr/src/code/tests
      - ./app:/usr/src/code/app
@@ -112,7 +110,7 @@ services:
      - _APP_OPTIONS_ABUSE
      - _APP_OPTIONS_ROUTER_PROTECTION
      - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_COMPUTE_FORCE_HTTPS
+      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
      - _APP_OPENSSL_KEY_V1
      - _APP_DOMAIN
      - _APP_DOMAIN_TARGET
@@ -142,7 +140,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
@@ -159,15 +156,12 @@ services:
      - _APP_STORAGE_WASABI_SECRET
      - _APP_STORAGE_WASABI_REGION
      - _APP_STORAGE_WASABI_BUCKET
-      - _APP_COMPUTE_SIZE_LIMIT
-      - _APP_COMPUTE_TIMEOUT
-      - _APP_COMPUTE_BUILD_TIMEOUT
-      - _APP_COMPUTE_CPUS
-      - _APP_COMPUTE_MEMORY
+      - _APP_FUNCTIONS_SIZE_LIMIT
+      - _APP_FUNCTIONS_TIMEOUT
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
      - _APP_FUNCTIONS_RUNTIMES
-      - _APP_SITES_RUNTIMES
-      - _APP_SITES_FRAMEWORKS
-      - _APP_DOMAIN_SITES
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
      - _APP_LOGGING_CONFIG
@@ -202,11 +196,14 @@ services:
      - _APP_DATABASE_SHARED_TABLES_V1
      - _APP_DATABASE_SHARED_NAMESPACE
      - _APP_FUNCTIONS_CREATION_ABUSE_LIMIT
+      - _APP_SLOW_QUERIES_MAX_HITS
+      - _APP_SLOW_QUERIES_TIMEOUT
+      - _APP_SLOW_QUERIES

  appwrite-console:
    <<: *x-logging
    container_name: appwrite-console
-    image: appwrite/console:5.3.0-sites-rc.24
+    image: appwrite/console:5.2.27
    restart: unless-stopped
    networks:
      - appwrite
@@ -349,7 +346,6 @@ services:
      - appwrite-uploads:/storage/uploads:rw
      - appwrite-cache:/storage/cache:rw
      - appwrite-functions:/storage/functions:rw
-      - appwrite-sites:/storage/sites:rw
      - appwrite-builds:/storage/builds:rw
      - appwrite-certificates:/storage/certificates:rw
      - ./app:/usr/src/code/app
@@ -372,7 +368,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
@@ -436,9 +431,7 @@ services:
      - appwrite
    volumes:
      - appwrite-functions:/storage/functions:rw
-      - appwrite-sites:/storage/sites:rw
      - appwrite-builds:/storage/builds:rw
-      - appwrite-uploads:/storage/uploads:rw
      - ./app:/usr/src/code/app
      - ./src:/usr/src/code/src
    depends_on:
@@ -463,20 +456,19 @@ services:
      - _APP_VCS_GITHUB_APP_NAME
      - _APP_VCS_GITHUB_PRIVATE_KEY
      - _APP_VCS_GITHUB_APP_ID
-      - _APP_COMPUTE_TIMEOUT
-      - _APP_COMPUTE_BUILD_TIMEOUT
-      - _APP_COMPUTE_CPUS
-      - _APP_COMPUTE_MEMORY
-      - _APP_COMPUTE_SIZE_LIMIT
+      - _APP_FUNCTIONS_TIMEOUT
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
+      - _APP_FUNCTIONS_SIZE_LIMIT
      - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_COMPUTE_FORCE_HTTPS
+      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
      - _APP_DOMAIN
      - _APP_STORAGE_DEVICE
      - _APP_STORAGE_S3_ACCESS_KEY
      - _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
@@ -494,7 +486,6 @@ services:
      - _APP_STORAGE_WASABI_REGION
      - _APP_STORAGE_WASABI_BUCKET
      - _APP_DATABASE_SHARED_TABLES
-      - _APP_DOMAIN_SITES

  appwrite-worker-certificates:
    entrypoint: worker-certificates
@@ -560,10 +551,10 @@ services:
      - _APP_DB_SCHEMA
      - _APP_DB_USER
      - _APP_DB_PASS
-      - _APP_COMPUTE_TIMEOUT
-      - _APP_COMPUTE_BUILD_TIMEOUT
-      - _APP_COMPUTE_CPUS
-      - _APP_COMPUTE_MEMORY
+      - _APP_FUNCTIONS_TIMEOUT
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
      - _APP_USAGE_STATS
@@ -643,7 +634,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
@@ -735,72 +725,10 @@ services:
      - _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
-    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
-  
-  appwrite-worker-stats-usage:
-    entrypoint: worker-stats-usage
-    <<: *x-logging
-    container_name: appwrite-worker-stats-usage
+    container_name: appwrite-worker-usage
    image: appwrite-dev
    networks:
      - appwrite
@@ -828,10 +756,10 @@ services:
      - _APP_USAGE_AGGREGATION_INTERVAL
      - _APP_DATABASE_SHARED_TABLES

-  appwrite-worker-stats-usage-dump:
-    entrypoint: worker-stats-usage-dump
+  appwrite-worker-usage-dump:
+    entrypoint: worker-usage-dump
    <<: *x-logging
-    container_name: appwrite-worker-stats-usage-dump
+    container_name: appwrite-worker-usage-dump
    image: appwrite-dev
    networks:
      - appwrite
@@ -858,8 +786,7 @@ services:
      - _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,18 +878,12 @@ services:
    environment:
      - _APP_ASSISTANT_OPENAI_API_KEY

-  appwrite-browser:
-    container_name: appwrite-browser
-    image: appwrite/browser:0.2.2
-    networks:
-      - appwrite
-
  openruntimes-executor:
    container_name: openruntimes-executor
    hostname: exc1
    <<: *x-logging
    stop_signal: SIGINT
-    image: openruntimes/executor:0.7.10
+    image: openruntimes/executor:0.6.11
    restart: unless-stopped
    networks:
      - appwrite
@@ -971,28 +892,25 @@ services:
      - /var/run/docker.sock:/var/run/docker.sock
      - appwrite-builds:/storage/builds:rw
      - appwrite-functions:/storage/functions:rw
-      - appwrite-sites:/storage/sites:rw
      # Host mount nessessary to share files between executor and runtimes.
      # It's not possible to share mount file between 2 containers without host mount (copying is too slow)
      - /tmp:/tmp:rw
    environment:
-      - OPR_EXECUTOR_IMAGE_PULL=enabled
-      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_COMPUTE_INACTIVE_THRESHOLD
-      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_COMPUTE_MAINTENANCE_INTERVAL
-      - OPR_EXECUTOR_NETWORK=$_APP_COMPUTE_RUNTIMES_NETWORK
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_FUNCTIONS_INACTIVE_THRESHOLD
+      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_FUNCTIONS_MAINTENANCE_INTERVAL
+      - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
      - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD
      - OPR_EXECUTOR_ENV=$_APP_ENV
-      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES,$_APP_SITES_RUNTIMES
+      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
      - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
-      - OPR_EXECUTOR_RUNTIME_VERSIONS=v2,v5
+      - OPR_EXECUTOR_RUNTIME_VERSIONS=v2,v4
      - OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
      - OPR_EXECUTOR_STORAGE_DEVICE=$_APP_STORAGE_DEVICE
      - OPR_EXECUTOR_STORAGE_S3_ACCESS_KEY=$_APP_STORAGE_S3_ACCESS_KEY
      - 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
@@ -1143,6 +1061,5 @@ volumes:
  appwrite-uploads:
  appwrite-certificates:
  appwrite-functions:
-  appwrite-sites:
  appwrite-builds:
  appwrite-config:
@@ -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
    }
 }
@@ -0,0 +1,8 @@
+query {
+    functionsGetDeploymentDownload(
+        functionId: "<FUNCTION_ID>",
+        deploymentId: "<DEPLOYMENT_ID>"
+    ) {
+        status
+    }
+}
@@ -0,0 +1,35 @@
+query {
+    functionsGetTemplate(
+        templateId: "<TEMPLATE_ID>"
+    ) {
+        icon
+        id
+        name
+        tagline
+        permissions
+        events
+        cron
+        timeout
+        useCases
+        runtimes {
+            name
+            commands
+            entrypoint
+            providerRootDirectory
+        }
+        instructions
+        vcsProvider
+        providerRepositoryId
+        providerOwner
+        providerVersion
+        variables {
+            name
+            description
+            value
+            placeholder
+            required
+            type
+        }
+        scopes
+    }
+}
@@ -0,0 +1,41 @@
+query {
+    functionsListTemplates(
+        runtimes: [],
+        useCases: [],
+        limit: 1,
+        offset: 0
+    ) {
+        total
+        templates {
+            icon
+            id
+            name
+            tagline
+            permissions
+            events
+            cron
+            timeout
+            useCases
+            runtimes {
+                name
+                commands
+                entrypoint
+                providerRootDirectory
+            }
+            instructions
+            vcsProvider
+            providerRepositoryId
+            providerOwner
+            providerVersion
+            variables {
+                name
+                description
+                value
+                placeholder
+                required
+                type
+            }
+            scopes
+        }
+    }
+}
@@ -0,0 +1,14 @@
+import { Client, Functions } from "react-native-appwrite";
+
+const client = new Client()
+    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
+    .setProject('<YOUR_PROJECT_ID>'); // Your project ID
+
+const functions = new Functions(client);
+
+const result = functions.getDeploymentDownload(
+    '<FUNCTION_ID>', // functionId
+    '<DEPLOYMENT_ID>' // deploymentId
+);
+
+console.log(result);
@@ -0,0 +1,13 @@
+import { Client, Functions } from "react-native-appwrite";
+
+const client = new Client()
+    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
+    .setProject('<YOUR_PROJECT_ID>'); // Your project ID
+
+const functions = new Functions(client);
+
+const result = await functions.getTemplate(
+    '<TEMPLATE_ID>' // templateId
+);
+
+console.log(result);
@@ -0,0 +1,16 @@
+import { Client, Functions } from "react-native-appwrite";
+
+const client = new Client()
+    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
+    .setProject('<YOUR_PROJECT_ID>'); // Your project ID
+
+const functions = new Functions(client);
+
+const result = await functions.listTemplates(
+    [], // runtimes (optional)
+    [], // useCases (optional)
+    1, // limit (optional)
+    0 // offset (optional)
+);
+
+console.log(result);
@@ -0,0 +1,8 @@
+GET /v1/functions/{functionId}/deployments/{deploymentId}/download HTTP/1.1
+Host: cloud.appwrite.io
+Content-Type: application/json
+X-Appwrite-Response-Format: 1.6.0
+X-Appwrite-Project: <YOUR_PROJECT_ID>
+X-Appwrite-Session: 
+X-Appwrite-JWT: <YOUR_JWT>
+
@@ -0,0 +1,6 @@
+GET /v1/functions/templates/{templateId} HTTP/1.1
+Host: cloud.appwrite.io
+Content-Type: application/json
+X-Appwrite-Response-Format: 1.6.0
+X-Appwrite-Project: <YOUR_PROJECT_ID>
+
@@ -0,0 +1,6 @@
+GET /v1/functions/templates HTTP/1.1
+Host: cloud.appwrite.io
+Content-Type: application/json
+X-Appwrite-Response-Format: 1.6.0
+X-Appwrite-Project: <YOUR_PROJECT_ID>
+
@@ -0,0 +1,14 @@
+import { Client, Functions } from "appwrite";
+
+const client = new Client()
+    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
+    .setProject('<YOUR_PROJECT_ID>'); // Your project ID
+
+const functions = new Functions(client);
+
+const result = functions.getDeploymentDownload(
+    '<FUNCTION_ID>', // functionId
+    '<DEPLOYMENT_ID>' // deploymentId
+);
+
+console.log(result);
@@ -0,0 +1,13 @@
+import { Client, Functions } from "appwrite";
+
+const client = new Client()
+    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
+    .setProject('<YOUR_PROJECT_ID>'); // Your project ID
+
+const functions = new Functions(client);
+
+const result = await functions.getTemplate(
+    '<TEMPLATE_ID>' // templateId
+);
+
+console.log(result);
@@ -0,0 +1,16 @@
+import { Client, Functions } from "appwrite";
+
+const client = new Client()
+    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
+    .setProject('<YOUR_PROJECT_ID>'); // Your project ID
+
+const functions = new Functions(client);
+
+const result = await functions.listTemplates(
+    [], // runtimes (optional)
+    [], // useCases (optional)
+    1, // limit (optional)
+    0 // offset (optional)
+);
+
+console.log(result);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jake Barnby	fffa8bdc7f	Update lock	2025-01-30 22:58:48 +13:00
Jake Barnby	7f699910b6	Merge remote-tracking branch 'origin/1.6.x' into poc-timeout # Conflicts: # composer.lock	2025-01-30 22:52:16 +13:00
Jake Barnby	e8722c10e8	Update tests	2025-01-29 23:41:43 +13:00
Jake Barnby	d32299fe1d	Format	2025-01-28 22:12:13 +13:00
Jake Barnby	3d0884aaec	Update hooks	2025-01-28 22:10:00 +13:00
Jake Barnby	3b71215b4f	Fix merge	2025-01-28 21:55:11 +13:00
Jake Barnby	34074f74a7	Merge remote-tracking branch 'origin/1.6.x' into poc-timeout # Conflicts: # .env # app/config/collections.php # app/config/errors.php # app/controllers/api/databases.php # app/views/install/compose.phtml # composer.lock # docker-compose.yml # src/Appwrite/Extend/Exception.php # src/Appwrite/Utopia/Response.php	2025-01-28 21:46:12 +13:00
fogelito	cd5f6d6ecd	uncomment appwrite-assistant	2023-08-15 11:50:27 +03:00
fogelito	a0057a6e5d	Merge branch '1.4.x' of github.com:appwrite/appwrite into poc-timeout	2023-08-15 11:49:35 +03:00
fogelito	943a7af885	Slow queries response model	2023-08-15 11:47:04 +03:00
Jake BarnbyandGitHub	c93aea7669	Update docker-compose.yml	2023-08-15 01:35:59 -04:00
Jake Barnby	603c2083ef	Uncomment service	2023-08-15 01:24:37 -04:00
Jake Barnby	0ceef6b24f	Add slow query model	2023-08-15 01:06:52 -04:00
Jake Barnby	7cf899b302	Fix tests	2023-08-15 00:12:38 -04:00
Jake Barnby	5128c10348	Fix tests	2023-08-14 23:08:56 -04:00
Jake Barnby	479b41d914	Fix tests	2023-08-14 22:24:15 -04:00
fogelito	86abba7618	fix collections.php ID::custom	2023-08-15 00:50:40 +03:00
fogelito	0522affba0	fix collections.php	2023-08-15 00:41:34 +03:00
fogelito	ab9ee84ed0	composer.lock	2023-08-14 23:36:15 +03:00
fogelito	e67292a614	Merge branch '1.4.x' of github.com:appwrite/appwrite into poc-timeout Conflicts: composer.lock tests/e2e/Services/Databases/DatabasesBase.php	2023-08-14 22:01:31 +03:00
fogelito	7519e281a3	composer	2023-08-14 21:58:18 +03:00
fogelito	94c7fd74e4	composer versions	2023-08-09 18:27:31 +03:00
fogelito	41ca0c4165	composer.lock	2023-08-09 17:51:37 +03:00
fogelito	5578cea29f	comment out appwrite-assistant	2023-08-09 17:20:05 +03:00
fogelito	aa48432acd	composer.json update	2023-08-09 13:10:29 +03:00
fogelito	7c7678b0cb	composer.lock	2023-08-09 13:03:58 +03:00
fogelito	a46a405b5c	docker-compose.yml fixed	2023-08-09 13:02:08 +03:00
fogelito	fa13eb1064	.env	2023-08-09 13:00:10 +03:00
fogelito	c823e36183	remove unchanged setResource	2023-08-09 12:47:26 +03:00
Shmuel Fogel GitHub Jake Barnby	ecb142fa50	Update app/controllers/api/databases.php Co-authored-by: Jake Barnby <jakeb994@gmail.com>	2023-08-09 12:40:18 +03:00
fogelito	aceb49505c	pull changes	2023-08-09 12:38:34 +03:00
fogelito	eed89b9fd3	Merge branch '1.4.x' of github.com:appwrite/appwrite into poc-timeout Conflicts: .env app/controllers/api/databases.php composer.json composer.lock docker-compose.yml	2023-08-09 12:36:23 +03:00
fogelito	e6cf0a6ac3	addressing comments	2023-08-09 12:27:32 +03:00
fogelito	0f57d87c55	composer.lock	2023-08-01 11:32:38 +03:00
fogelito	d61921573b	composer	2023-08-01 11:32:23 +03:00
fogelito	82c9c074bc	merge in master	2023-08-01 11:29:39 +03:00
fogelito	632d41ec6c	Merge branch 'master' of github.com:appwrite/appwrite into poc-timeout Conflicts: app/controllers/api/databases.php composer.json composer.lock tests/e2e/Services/Databases/DatabasesBase.php	2023-08-01 11:25:21 +03:00
fogelito	59dd6bfbcc	composer update	2023-08-01 11:13:14 +03:00
fogelito	54cae4ab00	composer update	2023-08-01 11:13:01 +03:00
fogelito	1e9daf98cb	.env _APP_SLOW_QUERIES_MAX_HITS set to 5	2023-03-06 11:42:38 +02:00
fogelito	408e611b76	.env _APP_SLOW_QUERIES_MAX_HITS set to 5	2023-03-06 11:40:35 +02:00
fogelito	bd582bd00d	addressing comments	2023-03-06 10:57:32 +02:00
fogelito	25aa6049cd	space removes	2023-03-06 10:45:56 +02:00
fogelito	2a7ca5fe67	set setResource return	2023-03-06 10:41:50 +02:00
fogelito	13b52a67a9	datetime validator name change	2023-03-06 10:26:20 +02:00
fogelito	466a469035	Merge remote-tracking branch 'origin/poc-timeout' into poc-timeout	2023-03-06 10:09:39 +02:00
fogelito	96a78a0763	collection require = true	2023-03-06 10:08:09 +02:00
Shmuel Fogel GitHub Jake Barnby	33fb110bac	Update docs/references/databases/delete-slow-query-document.md Co-authored-by: Jake Barnby <jakeb994@gmail.com>	2023-03-06 09:57:53 +02:00
Shmuel Fogel GitHub Jake Barnby	0936072e17	Update app/config/errors.php Co-authored-by: Jake Barnby <jakeb994@gmail.com>	2023-03-02 09:05:59 +02:00
fogelito	d34af2764d	stopOnFailure="false"	2023-03-02 09:04:36 +02:00
fogelito	05485afb99	remove cursor hint + merge in 0.13.x	2023-03-02 08:58:58 +02:00
fogelito	ef6a95252e	Merge branch '1.3.x' of github.com:appwrite/appwrite into poc-timeout	2023-03-02 08:56:36 +02:00
fogelito	9322d1636e	Last fixed before pull	2023-03-01 19:05:15 +02:00
fogelito	2f46d5c4a6	tests fixes	2023-03-01 18:39:38 +02:00
fogelito	3d3ffba93a	console route change	2023-03-01 18:32:13 +02:00
Shmuel Fogel GitHub Jake Barnby	72b30d4f60	Update app/config/errors.php Co-authored-by: Jake Barnby <jakeb994@gmail.com>	2023-03-01 16:12:57 +02:00
Shmuel Fogel GitHub Jake Barnby	962a44b3a8	Update app/controllers/api/databases.php Co-authored-by: Jake Barnby <jakeb994@gmail.com>	2023-03-01 16:12:15 +02:00
Shmuel Fogel GitHub Jake Barnby	6b884150cd	Update app/controllers/api/databases.php Co-authored-by: Jake Barnby <jakeb994@gmail.com>	2023-03-01 16:12:02 +02:00
fogelito	c315240bce	addressing comments	2023-03-01 15:56:16 +02:00
fogelito	c0febfff5b	Merge remote-tracking branch 'origin/poc-timeout' into poc-timeout	2023-02-28 19:34:17 +02:00
fogelito	3f9b8afbb4	addressing comments	2023-02-28 19:34:04 +02:00
Shmuel Fogel GitHub Jake Barnby	707c8033b8	Update app/controllers/api/databases.php Co-authored-by: Jake Barnby <jakeb994@gmail.com>	2023-02-28 19:21:12 +02:00
Shmuel Fogel GitHub Jake Barnby	ae981d90c9	Update app/controllers/api/databases.php Co-authored-by: Jake Barnby <jakeb994@gmail.com>	2023-02-28 18:39:11 +02:00
Shmuel Fogel GitHub Jake Barnby	3964e86340	Update app/controllers/api/databases.php Co-authored-by: Jake Barnby <jakeb994@gmail.com>	2023-02-28 18:34:38 +02:00
Shmuel Fogel GitHub Jake Barnby	5a1ac151d9	Update app/controllers/api/databases.php Co-authored-by: Jake Barnby <jakeb994@gmail.com>	2023-02-28 18:32:47 +02:00
fogelito	031d85e5d6	remove comment	2023-02-23 12:26:24 +02:00
fogelito	ad320e97c6	fix empty queries	2023-02-23 12:15:11 +02:00
fogelito	497e505775	longtext.txt	2023-02-23 10:57:57 +02:00
fogelito	947193ef24	_APP_SLOW_QUERIES enabled	2023-02-23 10:09:43 +02:00
fogelito	79e60e84da	collections.php changes	2023-02-23 10:06:16 +02:00
Shmuel Fogel GitHub Jake Barnby	03e3522568	_APP_SLOW_QUERIES_BLOCK Co-authored-by: Jake Barnby <jakeb994@gmail.com>	2023-02-23 10:05:25 +02:00
fogelito	8a30738f52	remove var_dump graphql	2023-02-23 09:46:40 +02:00
fogelito	188abb04a7	remove sleep	2023-02-21 13:33:09 +02:00
fogelito	04f2a0610d	remove sleep	2023-02-21 13:22:28 +02:00
fogelito	89c9c293e8	Less docs for timeout?	2023-02-21 10:20:12 +02:00
fogelito	601e1648a7	Timeouts tests	2023-02-21 10:11:08 +02:00
fogelito	470ff2289d	Timeouts tests	2023-02-21 10:05:23 +02:00
Jake Barnby	3a2ce3bf2b	Fix graphql tests	2023-02-21 13:59:23 +13:00
fogelito	211ef70279	native timeouts try	2023-02-20 12:06:09 +02:00
fogelito	2f37057e7a	native timeouts try	2023-02-20 11:36:57 +02:00
fogelito	c3a6cefd0a	native timeouts try	2023-02-20 11:06:00 +02:00
fogelito	82bcbf3306	native timeouts try	2023-02-16 19:48:15 +02:00
fogelito	f6a27cbd84	remove line	2023-02-16 11:50:31 +02:00
fogelito	318076297b	graphQL tests fails	2023-02-16 10:42:08 +02:00
fogelito	93c25e87d5	tests updates	2023-02-15 13:36:30 +02:00
fogelito	ea0c7e9a4c	composer.lock	2023-02-15 12:45:19 +02:00
fogelito	95e204b8d9	filter todo	2023-02-15 12:21:03 +02:00
fogelito	72a30cf65f	Merge branch 'master' of github.com:appwrite/appwrite into poc-timeout Conflicts: app/controllers/api/databases.php app/init.php composer.json composer.lock tests/e2e/General/UsageTest.php tests/e2e/Services/Account/AccountCustomClientTest.php tests/e2e/Services/Databases/DatabasesBase.php tests/e2e/Services/Databases/DatabasesCustomServerTest.php tests/e2e/Services/Functions/FunctionsCustomServerTest.php tests/e2e/Services/Storage/StorageBase.php tests/e2e/Services/Storage/StorageCustomClientTest.php tests/e2e/Services/Storage/StorageCustomServerTest.php tests/e2e/Services/Teams/TeamsBase.php tests/e2e/Services/Teams/TeamsBaseClient.php tests/e2e/Services/Webhooks/WebhooksBase.php tests/e2e/Services/Webhooks/WebhooksCustomClientTest.php tests/e2e/Services/Webhooks/WebhooksCustomServerTest.php	2023-02-15 11:22:35 +02:00
fogelito	558869b118	update tests	2023-02-14 18:33:00 +02:00
fogelito	ff2a300caf	_APP_SLOW_QUERIES bool	2023-02-14 15:14:16 +02:00
fogelito	49fe9a9fea	timeouts tests pass	2023-02-14 15:09:58 +02:00
fogelito	57c8cde568	timeouts tests pass	2023-02-14 14:42:05 +02:00
fogelito	e2bb3270b3	composer .lock	2023-02-14 13:06:23 +02:00
fogelito	895c546884	403 error	2023-02-14 13:05:59 +02:00
fogelito	60c7d19be6	env variables	2023-02-14 09:39:19 +02:00
fogelito	a71e23a943	env variables	2023-02-14 09:35:03 +02:00
fogelito	dd1b9a5338	env variables	2023-02-13 19:24:29 +02:00
fogelito	a90b3eb307	build after changes	2023-02-13 19:11:57 +02:00
fogelito	8779ce855d	slow_queries	2023-02-13 18:38:57 +02:00
fogelito	84609e208f	slow queries collection name to snake case	2023-02-13 18:34:22 +02:00
fogelito	9650d9867c	_APP_SLOW_QUERIES_ACTIVE	2023-02-13 17:50:12 +02:00
fogelito	d2142e7313	add helpers namespace	2023-02-13 17:43:58 +02:00
fogelito	238c405fc0	.env variables for slow queries	2023-02-13 17:23:05 +02:00
fogelito	7cd1ffc085	DatabasesCustomClientTest.php uncomment tests	2023-02-12 23:53:52 +02:00
fogelito	bf84ac3adc	Merge remote-tracking branch 'origin/poc-timeout' into poc-timeout	2023-02-12 23:51:35 +02:00
fogelito	3e66b764ec	resolve comments $timeoutMilliseconds	2023-02-12 23:51:24 +02:00
Shmuel Fogel GitHub Eldad A. Fux	167d127481	Update app/init.php Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>	2023-02-12 23:47:31 +02:00
Shmuel Fogel GitHub Eldad A. Fux	09128267e0	Update docker-compose.yml Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>	2023-02-12 23:47:23 +02:00
Shmuel Fogel GitHub Eldad A. Fux	a32019e8dc	Update app/controllers/api/databases.php Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>	2023-02-12 23:46:48 +02:00
Shmuel Fogel GitHub Eldad A. Fux	87bc7ad8b0	Update app/controllers/api/databases.php Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>	2023-02-12 23:35:09 +02:00
fogelito	cf96f8baca	change timeout colllection to slow queries	2023-02-12 23:33:42 +02:00
fogelito	3d76da1f25	change timeout colllection to slow queries	2023-02-12 23:05:10 +02:00
fogelito	e5cd1dd842	Merge remote-tracking branch 'origin/poc-timeout' into poc-timeout	2023-02-12 22:49:37 +02:00
fogelito	3841287fc2	composer changes	2023-02-12 22:49:12 +02:00
fogelito	9cfeab7c64	default	2023-02-05 17:36:14 +02:00
fogelito	3a88457052	default	2023-02-05 17:21:08 +02:00
fogelito	00abaef65f	add method key	2023-02-05 16:51:04 +02:00
fogelito	d01be37a9c	md5	2023-02-05 16:49:22 +02:00
fogelito	898f02e1c8	Update list with databaseId	2023-02-02 10:55:23 +02:00
fogelito	593f7154a4	Update list with databaseId	2023-01-31 18:17:07 +02:00
fogelito	3ac2adf13f	Update list with databaseId	2023-01-31 18:16:24 +02:00
fogelito	76592b8ea4	Tests for new routes	2023-01-30 17:04:26 +02:00
fogelito	b19365a35f	Tests for new routes	2023-01-30 16:59:39 +02:00
fogelito	6aab350669	change route names	2023-01-30 12:36:15 +02:00
fogelito	f58581663e	framework upgrade 0.27.0	2023-01-30 10:38:29 +02:00
fogelito	b95f52edf7	Some tests	2023-01-29 14:40:27 +02:00
fogelito	73a2d103fb	Query filters + cursor for list slow queries	2023-01-29 14:33:52 +02:00
fogelito	14a6f407b8	timeout get	2023-01-25 11:07:19 +02:00
fogelito	1bcb2b561a	timeout get	2023-01-25 11:05:49 +02:00
fogelito	bad3b40ae9	timeout patch	2023-01-25 10:48:44 +02:00
fogelito	a69d6fd3f8	New timeout rout for list blocked docs	2023-01-24 19:30:59 +02:00
fogelito	55ca917edf	Code clean up	2023-01-22 14:01:22 +02:00
fogelito	d610a14388	Code clean up	2023-01-19 17:51:23 +02:00
fogelito	017ef1f13c	remove comments	2023-01-19 11:20:42 +02:00
fogelito	1a7e65d339	error resource changes	2023-01-19 11:19:16 +02:00
fogelito	317469c8fc	debugging var dumps	2023-01-18 19:25:18 +02:00
fogelito	d615674da6	Some changes	2023-01-17 19:10:41 +02:00
fogelito	c39235410e	remove the hardcoded throw Timeout Exception;	2023-01-16 08:41:20 +02:00
fogelito	40bd8d54e5	remove the hardcoded throw Timeout Exception;	2023-01-16 08:32:47 +02:00
fogelito	3c5b14abe7	add tests for sleep operator	2023-01-15 12:57:41 +02:00
fogelito	e746634491	validate the sleep operator	2023-01-12 18:30:34 +02:00
fogelito	9241d37c26	starting using hooks	2023-01-11 17:38:28 +02:00
fogelito	347d4afa24	Some POC for exceed timeout case	2023-01-08 12:05:50 +02:00