Merge branch 'feat-sites' into feat-add-fallbackFile-attribute

Merge pull request #9010 from appwrite/chore-add-site-domains-var
Add _APP_DOMAIN_SITES to console variables
2026-05-26 13:51:13 +00:00 · 2024-11-20 14:33:19 +01:00 · 2024-11-20 14:33:02 +01:00 · 2024-11-20 14:19:15 +01:00 · 2024-11-20 14:18:43 +01:00 · 2024-11-20 14:14:28 +01:00
17528 changed files with 73577 additions and 211261 deletions
@@ -15,16 +15,15 @@ _APP_SYSTEM_TEAM_EMAIL=team@appwrite.io
 _APP_EMAIL_SECURITY=security@appwrite.io
 _APP_EMAIL_CERTIFICATES=certificates@appwrite.io
 _APP_SYSTEM_RESPONSE_FORMAT=
-_APP_CUSTOM_DOMAIN_DENY_LIST=
 _APP_OPTIONS_ABUSE=disabled
 _APP_OPTIONS_ROUTER_PROTECTION=disabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
-_APP_OPTIONS_FUNCTIONS_FORCE_HTTPS=disabled
+_APP_OPTIONS_COMPUTE_FORCE_HTTPS=disabled
 _APP_OPENSSL_KEY_V1=your-secret-key
 _APP_DOMAIN=traefik
 _APP_DOMAIN_FUNCTIONS=functions.localhost
+_APP_DOMAIN_SITES=sites.localhost
 _APP_DOMAIN_TARGET=localhost
-_APP_RULES_FORMAT=md5
 _APP_REDIS_HOST=redis
 _APP_REDIS_PORT=6379
 _APP_REDIS_PASS=
@@ -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,26 +68,26 @@ _APP_SMS_FROM=+123456789
 _APP_SMS_PROJECTS_DENY_LIST=
 _APP_STORAGE_LIMIT=30000000
 _APP_STORAGE_PREVIEW_LIMIT=20000000
-_APP_FUNCTIONS_SIZE_LIMIT=30000000
-_APP_FUNCTIONS_TIMEOUT=900
-_APP_FUNCTIONS_BUILD_TIMEOUT=900
-_APP_FUNCTIONS_CPUS=8
-_APP_FUNCTIONS_MEMORY=8192
-_APP_FUNCTIONS_INACTIVE_THRESHOLD=600
-_APP_FUNCTIONS_MAINTENANCE_INTERVAL=600
-_APP_FUNCTIONS_RUNTIMES_NETWORK=runtimes
+_APP_COMPUTE_SIZE_LIMIT=30000000
+_APP_COMPUTE_TIMEOUT=900
+_APP_COMPUTE_BUILD_TIMEOUT=900
+_APP_COMPUTE_CPUS=8
+_APP_COMPUTE_MEMORY=8192
+_APP_COMPUTE_INACTIVE_THRESHOLD=600
+_APP_COMPUTE_MAINTENANCE_INTERVAL=600
+_APP_COMPUTE_RUNTIMES_NETWORK=runtimes
 _APP_EXECUTOR_SECRET=your-secret-key
 _APP_EXECUTOR_HOST=http://proxy/v1
 _APP_FUNCTIONS_RUNTIMES=php-8.0,node-18.0,python-3.9,ruby-3.1
+_APP_SITES_RUNTIMES=static-1,node-22
+_APP_SITES_FRAMEWORKS=sveltekit,nextjs,static
 _APP_MAINTENANCE_INTERVAL=86400
 _APP_MAINTENANCE_DELAY=
 _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
 _APP_MAINTENANCE_RETENTION_AUDIT=1209600
-_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE=15778800
 _APP_USAGE_AGGREGATION_INTERVAL=30
-_APP_STATS_RESOURCES_INTERVAL=3600
 _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
 _APP_MAINTENANCE_RETENTION_SCHEDULES=86400
 _APP_USAGE_STATS=enabled
@@ -113,5 +111,3 @@ _APP_MESSAGE_EMAIL_TEST_DSN=
 _APP_MESSAGE_PUSH_TEST_DSN=
 _APP_WEBHOOK_MAX_FAILED_ATTEMPTS=10
 _APP_PROJECT_REGIONS=default
-_APP_FUNCTIONS_CREATION_ABUSE_LIMIT=5000
-_APP_STATS_USAGE_DUAL_WRITING_DBS=database_db_main
@@ -13,13 +13,8 @@ on:
  schedule:
    - cron: '0 16 * * 0'

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

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

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

    - name: Extract metadata (tags, labels) for Docker
@@ -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
@@ -127,62 +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,
-          Storage,
-          Teams,
-          Users,
-          Webhooks,
-          VCS,
-          Messaging,
-          Migrations
-        ]
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Load Cache
-        uses: actions/cache@v4
-        with:
-          key: ${{ env.CACHE_KEY }}
-          path: /tmp/${{ env.IMAGE }}.tar
-          fail-on-cache-miss: true
-
-      - name: Load and Start Appwrite
-        run: |
-          docker load --input /tmp/${{ env.IMAGE }}.tar
-          docker compose up -d
-          sleep 30
-
-      - name: Run ${{ matrix.service }} tests with Project table mode
-        run: |
-          echo "Using project tables"
-          export _APP_DATABASE_SHARED_TABLES=
-          export _APP_DATABASE_SHARED_TABLES_V1=
-
-          docker compose exec -T \
-            -e _APP_DATABASE_SHARED_TABLES \
-            -e _APP_DATABASE_SHARED_TABLES_V1 \
-            appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug
-
-  e2e_shared_mode_test:
-    name: E2E Shared Mode Service Test
-    runs-on: ubuntu-latest
-    needs: [ setup, check_database_changes ]
-    if: needs.check_database_changes.outputs.database_changed == 'true'
    strategy:
      fail-fast: false
      matrix:
@@ -207,10 +127,6 @@ jobs:
            Messaging,
            Migrations
          ]
-        tables-mode: [
-          'Shared V1',
-          'Shared V2',
-        ]

    steps:
      - name: checkout
@@ -227,31 +143,18 @@ jobs:
        run: |
          docker load --input /tmp/${{ env.IMAGE }}.tar
          docker compose up -d
-          sleep 30
+          sleep 60

-      - name: Run ${{ matrix.service }} tests with ${{ matrix.tables-mode }} table mode
-        run: |
-          if [ "${{ matrix.tables-mode }}" == "Shared V1" ]; then
-            echo "Using shared tables V1"
-            export _APP_DATABASE_SHARED_TABLES=database_db_main
-            export _APP_DATABASE_SHARED_TABLES_V1=database_db_main
-          elif [ "${{ matrix.tables-mode }}" == "Shared V2" ]; then
-            echo "Using shared tables V2"
-            export _APP_DATABASE_SHARED_TABLES=database_db_main
-            export _APP_DATABASE_SHARED_TABLES_V1=
-          fi
-          
-          docker compose exec -T \
-            -e _APP_DATABASE_SHARED_TABLES \
-            -e _APP_DATABASE_SHARED_TABLES_V1 \
-            appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug
+      - name: Run ${{matrix.service}} Tests
+        run: docker compose exec -T appwrite test /usr/src/code/tests/e2e/Services/${{matrix.service}} --debug
+
+      - name: Run ${{matrix.service}} Shared Tables Tests
+        run: _APP_DATABASE_SHARED_TABLES=database_db_main docker compose exec -T appwrite test /usr/src/code/tests/e2e/Services/${{matrix.service}} --debug

  benchmarking:
    name: Benchmark
    runs-on: ubuntu-latest
    needs: setup
-    permissions:
-      pull-requests: write
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
@@ -312,7 +215,6 @@ jobs:
          path: benchmark.json
          retention-days: 7
      - name: Find Comment
-        if: github.event.pull_request.head.repo.full_name == github.repository
        uses: peter-evans/find-comment@v3
        id: fc
        with:
@@ -320,7 +222,6 @@ jobs:
          comment-author: 'github-actions[bot]'
          body-includes: Benchmark results
      - name: Comment on PR
-        if: github.event.pull_request.head.repo.full_name == github.repository
        uses: peter-evans/create-or-update-comment@v4
        with:
          comment-id: ${{ steps.fc.outputs.comment-id }}
@@ -16,4 +16,4 @@ dev/yasd_init.php
 .phpunit.result.cache
 Makefile
 appwrite.json
-/.zed/
+/.zed/
@@ -7,7 +7,6 @@ tasks:
      docker pull composer
    command: |
      docker run --rm --interactive --tty \
-      --user "$(id -u):$(id -g)" \
      --volume $PWD:/app \
      composer install \
      --ignore-platform-reqs \
@@ -24,3 +23,11 @@ vscode:
  extensions:
    - ms-azuretools.vscode-docker
    - zobo.php-intellisense
+
+github:
+  # https://www.gitpod.io/docs/prebuilds#github-specific-configuration
+  prebuilds:
+    # enable for pull requests coming from forks (defaults to false)
+    pullRequestsFromForks: true
+    # add a check to pull requests (defaults to true)
+    addCheck: false
@@ -1,117 +1,3 @@
-# Version 1.6.1
-
-## What's Changed
-
-### Notable changes
-
-* Remove JPEG fallback for webp by @lohanidamodar in https://github.com/appwrite/appwrite/pull/8746
-* Add heic and avif support by @lohanidamodar in https://github.com/appwrite/appwrite/pull/7718
-* Add new runtimes by @Meldiron in https://github.com/appwrite/appwrite/pull/8771
-* Remove audits deletion by @shimonewman in https://github.com/appwrite/appwrite/pull/8766
-* Bump assistant by @loks0n in https://github.com/appwrite/appwrite/pull/8801
-* Change max queries values to 500 by @fogelito in https://github.com/appwrite/appwrite/pull/8802
-* Allow '.wav' as 'audio/x-wav' as well by @basert in https://github.com/appwrite/appwrite/pull/8846
-* Use 1 instead of 0.5 cpu for default function specification by @loks0n in https://github.com/appwrite/appwrite/pull/8848
-* Update function runtimes by @christyjacob4 in https://github.com/appwrite/appwrite/pull/8781
-* Add a realtime heartbeat by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/8943
-
-### Fixes
-
-* Trigger functions event only if event is not paused by @lohanidamodar in https://github.com/appwrite/appwrite/pull/8526
-* Update docker-compose to restart usage-dump by @feschaffa in https://github.com/appwrite/appwrite/pull/8642
-* Fix typo in scheduler base by @fogelito in https://github.com/appwrite/appwrite/pull/8691
-* Add domain and force HTTPS env vars to mail worker by @stnguyen90 in https://github.com/appwrite/appwrite/pull/8722
-* Fix webp by @lohanidamodar in https://github.com/appwrite/appwrite/pull/8732
-* Ignore junction tables by @fogelito in https://github.com/appwrite/appwrite/pull/8728
-* Fix logger throwing fatal error by @lohanidamodar in https://github.com/appwrite/appwrite/pull/8724
-* Fix missing protocol for testing SMTP by @byawitz in https://github.com/appwrite/appwrite/pull/8749
-* Make create execution async loose by @loks0n in https://github.com/appwrite/appwrite/pull/8707
-* Fix invalid cursor value by @fogelito in https://github.com/appwrite/appwrite/pull/8109
-* Fix target deletes by @abnegate in https://github.com/appwrite/appwrite/pull/8833
-* Fix translation commas by @loks0n in https://github.com/appwrite/appwrite/pull/8892
-* Fix Migrations having source creds being overwritten and add Migration tests by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8897
-* Fix validator usage for updating string size by @abnegate in https://github.com/appwrite/appwrite/pull/8890
-* Fix create user event not triggering by @loks0n in https://github.com/appwrite/appwrite/pull/8718
-* Improve error handling and logging in the database worker by @fogelito in https://github.com/appwrite/appwrite/pull/8944
-* Remove inaccurate info about leaving the URL parameter empty by @ebenezerdon in https://github.com/appwrite/appwrite/pull/8963
-* Ensure indexes are updated when updating an attribute key by @fogelito in https://github.com/appwrite/appwrite/pull/8971
-* Remove duplicate dart-2.16 runtime template by @stnguyen90 in https://github.com/appwrite/appwrite/pull/8972
-* Fix team invites with existing session by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/9006
-* Improve handling of HTTP requests by dispatching to safe workers by @Meldiron in https://github.com/appwrite/appwrite/pull/9016
-* Fix users create session secret by @stnguyen90 in https://github.com/appwrite/appwrite/pull/9019
-* Fix swoole task warning by @Meldiron in https://github.com/appwrite/appwrite/pull/9025
-
-### Miscellaneous
-
-* Update Init copy by @adityaoberai in https://github.com/appwrite/appwrite/pull/8557
-* Fix security scan permissions and comment by @EVDOG4LIFE in https://github.com/appwrite/appwrite/pull/8525
-* Add Trivy security scans by @btme0011 in https://github.com/appwrite/appwrite/pull/6876
-* Update database stack by @abnegate in https://github.com/appwrite/appwrite/pull/8564
-* Bump database by @abnegate in https://github.com/appwrite/appwrite/pull/8573
-* Sync main with 1.5.x by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8589
-* Add AWS to one-click installs by @byawitz in https://github.com/appwrite/appwrite/pull/8593
-* Update Init copy in readme by @adityaoberai in https://github.com/appwrite/appwrite/pull/8618
-* Sync main into 1.6.x by @stnguyen90 in https://github.com/appwrite/appwrite/pull/8685
-* Sync 1.6.x into main by @stnguyen90 in https://github.com/appwrite/appwrite/pull/8686
-* Feat coroutines by @Meldiron in https://github.com/appwrite/appwrite/pull/7826
-* Sync main into 1.6.x by @Meldiron in https://github.com/appwrite/appwrite/pull/8719
-* Sentence casing endpoint API reference by @choir241 in https://github.com/appwrite/appwrite/pull/8617
-* DB storage metrics by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8404
-* Fix exception thrown when optional array attribute does not exist by @lohanidamodar in https://github.com/appwrite/appwrite/pull/8391
-* Add projects channels to realtime by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/8735
-* Base for console roles support by @lohanidamodar in https://github.com/appwrite/appwrite/pull/8565
-* Remove DB disk storage calculation by @christyjacob4 in https://github.com/appwrite/appwrite/pull/8745
-* Messaging adapter default values by @shimonewman in https://github.com/appwrite/appwrite/pull/8742
-* Add payload response type by @loks0n in https://github.com/appwrite/appwrite/pull/8720
-* Fix flaky functions tests by @loks0n in https://github.com/appwrite/appwrite/pull/8682
-* Migrations Backups by @fogelito in https://github.com/appwrite/appwrite/pull/8186
-* Add test for response and request filters by @vermakhushboo in https://github.com/appwrite/appwrite/pull/8697
-* Bump version in SECURITY.md by @EVDOG4LIFE in https://github.com/appwrite/appwrite/pull/8755
-* Add originalId attribute to databases collection by @fogelito in https://github.com/appwrite/appwrite/pull/8764
-* Fix Walter References by @ItzNotABug in https://github.com/appwrite/appwrite/pull/8757
-* Update database by @abnegate in https://github.com/appwrite/appwrite/pull/8769
-* Move new attributes by @abnegate in https://github.com/appwrite/appwrite/pull/8777
-* Add ping endpoint by @loks0n in https://github.com/appwrite/appwrite/pull/8761
-* Fix GitHub action caching by @loks0n in https://github.com/appwrite/appwrite/pull/8772
-* Chore release ruby SDK by @abnegate in https://github.com/appwrite/appwrite/pull/8767
-* Call migration success on success by @abnegate in https://github.com/appwrite/appwrite/pull/8782
-* Update utopia-php/system to 0.9.0 by @basert in https://github.com/appwrite/appwrite/pull/8780
-* Move createDocument from api to worker by @vermakhushboo in https://github.com/appwrite/appwrite/pull/8776
-* Add missing indexes by @christyjacob4 in https://github.com/appwrite/appwrite/pull/8803
-* Update database by @abnegate in https://github.com/appwrite/appwrite/pull/8809
-* Fix typo in BLR region by @stnguyen90 in https://github.com/appwrite/appwrite/pull/8756
-* Add tests for project variables by @vermakhushboo in https://github.com/appwrite/appwrite/pull/8815
-* Replace 'Expires' with 'Cache-Control: private' header to avoid CDN caching by @basert in https://github.com/appwrite/appwrite/pull/8836
-* Allow blocking based on resource attributes by @basert in https://github.com/appwrite/appwrite/pull/8812
-* Check if resource is blocked inside functions worker by @basert in https://github.com/appwrite/appwrite/pull/8855
-* Fix missing allow attribute by @abnegate in https://github.com/appwrite/appwrite/pull/8889
-* Revert function execution order by @basert in https://github.com/appwrite/appwrite/pull/8857
-* Use resource type constants by @basert in https://github.com/appwrite/appwrite/pull/8895
-* Update Database lib by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8680
-* Update database by @abnegate in https://github.com/appwrite/appwrite/pull/8917
-* Update database by @abnegate in https://github.com/appwrite/appwrite/pull/8923
-* Update database for transaction counter fixes with retries by @abnegate in https://github.com/appwrite/appwrite/pull/8927
-* Validate string permissions  by @fogelito in https://github.com/appwrite/appwrite/pull/8929
-* Add PubSub adapter support by @basert in https://github.com/appwrite/appwrite/pull/8905
-* List memberships as client by @loks0n in https://github.com/appwrite/appwrite/pull/8913
-* Fix XDebug Extension not being removed by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8891
-* Update database by @abnegate in https://github.com/appwrite/appwrite/pull/8946
-* Use utopia compression by @loks0n in https://github.com/appwrite/appwrite/pull/8938
-* Make compression minimum size configurable by @loks0n in https://github.com/appwrite/appwrite/pull/8947
-* Revert "Update database" by @christyjacob4 in https://github.com/appwrite/appwrite/pull/8949
-* Fix setpaused by @loks0n in https://github.com/appwrite/appwrite/pull/8948
-* Use getDocument instead of find() for rules by @christyjacob4 in https://github.com/appwrite/appwrite/pull/8951
-* Remove double fetch from migrations worker by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8956
-* Fix memberships privacy MFA by @loks0n in https://github.com/appwrite/appwrite/pull/8969
-* Add telemetry by @basert in https://github.com/appwrite/appwrite/pull/8960
-* Send migration errors individually by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8959
-* Add console sdk previews by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/8990
-* Unset index length by @fogelito in https://github.com/appwrite/appwrite/pull/8978
-* Update base to 0.9.5 by @basert in https://github.com/appwrite/appwrite/pull/9005
-* Sync main into 1.6.x by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/9011
-* Improved shared tables V2 by @abnegate in https://github.com/appwrite/appwrite/pull/9013
-* Ensure backwards compatibility for 1.6.x by @christyjacob4 in https://github.com/appwrite/appwrite/pull/9018
-
 # Version 1.6.0

 ## What's Changed
@@ -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]
@@ -301,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.

@@ -367,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;
 ```
@@ -379,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;
@@ -428,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)
@@ -613,18 +613,6 @@ If you need to clear the cache, you can do so by running the following command:
 docker compose exec redis redis-cli FLUSHALL
 ```

-## Using preview domains locally
-
-Appwrite Functions are automatically given a domain you can visit to execute the function. This domain has format `[SOMETHING].functions.localhost` unless you changed `_APP_DOMAIN_FUNCTIONS` environment variable. This default value works great when running Appwrite locally, but it can be impossible to use preview domains with Cloud woekspaces such as Gitpod or GitHub Codespaces.
-
-To use preview domains on Cloud workspaces, you can visit hostname provided by them, and supply function's preview domain as URL parameter:
-
-```
-https://8080-appwrite-appwrite-mjeb3ebilwv.ws-eu116.gitpod.io/ping?preview=672b3c7eab1ac523ccf5.functions.localhost
-```
-
-The path was set to `/ping` intentionally. Visiting `/` for preview domains might trigger Console background worker, and trigger redirect to Console without our preview URL param. Visiting different path ensures this doesnt happen.
-
 ## Tutorials

 From time to time, our team will add tutorials that will help contributors find their way in the Appwrite source code. Below is a list of currently available tutorials:
@@ -640,7 +628,7 @@ Pull requests are great, but there are many other ways you can help Appwrite.

 ### Blogging & Speaking

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

 ### Presenting at Meetups

@@ -12,7 +12,7 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \
    --no-plugins --no-scripts --prefer-dist \
    `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`

-FROM appwrite/base:0.10.1 AS final
+FROM appwrite/base:0.9.5 AS final

 LABEL maintainer="team@appwrite.io"

@@ -85,9 +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/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.0
 ```

 ### 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.0
 ```

 #### 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.0
 ```

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

 ### 从旧版本升级

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

 ## 入门

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 Table of Contents:

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

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

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

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

 ### Unix

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

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

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

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

 ### Upgrade from an Older Version

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

 ## One-Click Setups

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

 #### Client

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

 #### Server

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

 #### Community

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

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

 ## Architecture

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

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

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

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

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

 ## Security

@@ -5,11 +5,8 @@ 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 Executor\Executor;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
 use Utopia\CLI\CLI;
@@ -22,11 +19,11 @@ 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 architecture agnostic for CLI
+// overwriting runtimes to be architectur agnostic for CLI
 Config::setParam('runtimes', (new Runtimes('v4'))->getAll(supported: false));

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

    return new Cache(new Sharding($adapters));
@@ -54,7 +52,7 @@ CLI::setResource('pools', function (Registry $register) {
    return $register->get('pools');
 }, ['register']);

-CLI::setResource('dbForPlatform', function ($pools, $cache) {
+CLI::setResource('dbForConsole', function ($pools, $cache) {
    $sleep = 3;
    $maxAttempts = 5;
    $attempts = 0;
@@ -69,9 +67,9 @@ CLI::setResource('dbForPlatform', function ($pools, $cache) {
                ->pop()
                ->getResource();

-            $dbForPlatform = new Database($dbAdapter, $cache);
+            $dbForConsole = new Database($dbAdapter, $cache);

-            $dbForPlatform
+            $dbForConsole
                ->setNamespace('_console')
                ->setMetadata('host', \gethostname())
                ->setMetadata('project', 'console');
@@ -80,7 +78,7 @@ CLI::setResource('dbForPlatform', function ($pools, $cache) {
            $collections = Config::getParam('collections', [])['console'];
            $last = \array_key_last($collections);

-            if (!($dbForPlatform->exists($dbForPlatform->getDatabase(), $last))) { /** TODO cache ready variable using registry */
+            if (!($dbForConsole->exists($dbForConsole->getDatabase(), $last))) { /** TODO cache ready variable using registry */
                throw new Exception('Tables not ready yet.');
            }

@@ -96,19 +94,15 @@ CLI::setResource('dbForPlatform', function ($pools, $cache) {
        throw new Exception("Console is not ready yet. Please try again later.");
    }

-    return $dbForPlatform;
+    return $dbForConsole;
 }, ['pools', 'cache']);

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

-    return function (Document $project) use ($pools, $dbForPlatform, $cache, &$databases) {
+    return function (Document $project) use ($pools, $dbForConsole, $cache, &$databases) {
        if ($project->isEmpty() || $project->getId() === 'console') {
-            return $dbForPlatform;
+            return $dbForConsole;
        }

        try {
@@ -120,9 +114,8 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform

        if (isset($databases[$dsn->getHost()])) {
            $database = $databases[$dsn->getHost()];
-            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

-            if (\in_array($dsn->getHost(), $sharedTables)) {
+            if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
                $database
                    ->setSharedTables(true)
                    ->setTenant($project->getInternalId())
@@ -143,10 +136,10 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform
            ->getResource();

        $database = new Database($dbAdapter, $cache);
-        $databases[$dsn->getHost()] = $database;
-        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

-        if (\in_array($dsn->getHost(), $sharedTables)) {
+        $databases[$dsn->getHost()] = $database;
+
+        if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
            $database
                ->setSharedTables(true)
                ->setTenant($project->getInternalId())
@@ -164,68 +157,22 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform

        return $database;
    };
-}, ['pools', 'dbForPlatform', 'cache']);
+}, ['pools', 'dbForConsole', 'cache']);

-CLI::setResource('getLogsDB', function (Group $pools, Cache $cache) {
-    $database = null;
-    return function (?Document $project = null) use ($pools, $cache, $database) {
-        if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getInternalId());
-            return $database;
-        }
-
-        $dbAdapter = $pools
-            ->get('logs')
-            ->pop()
-            ->getResource();
-
-        $database = new Database(
-            $dbAdapter,
-            $cache
-        );
-
-        $database
-            ->setSharedTables(true)
-            ->setNamespace('logsV1')
-            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_TASK)
-            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
-
-        // set tenant
-        if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getInternalId());
-        }
-
-        return $database;
-    };
-}, ['pools', 'cache']);
-
-CLI::setResource('queueForStatsUsage', function (Connection $publisher) {
-    return new StatsUsage($publisher);
-}, ['publisher']);
-CLI::setResource('queueForStatsResources', function (Publisher $publisher) {
-    return new StatsResources($publisher);
-}, ['publisher']);
-CLI::setResource('publisher', function (Group $pools) {
-    return $pools->get('publisher')->pop()->getResource();
+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) {
-        Console::error('[Error] Timestamp: ' . date('c', time()));
-        Console::error('[Error] Type: ' . get_class($error));
-        Console::error('[Error] Message: ' . $error->getMessage());
-        Console::error('[Error] File: ' . $error->getFile());
-        Console::error('[Error] Line: ' . $error->getLine());
-        Console::error('[Error] Trace: ' . $error->getTraceAsString());
-
        $logger = $register->get('logger');

        if ($logger) {
@@ -233,7 +180,7 @@ CLI::setResource('logError', function (Registry $register) {

            $log = new Log();
            $log->setNamespace($namespace);
-            $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
+            $log->setServer(\gethostname());
            $log->setVersion($version);
            $log->setType(Log::TYPE_ERROR);
            $log->setMessage($error->getMessage());
@@ -244,7 +191,6 @@ CLI::setResource('logError', function (Registry $register) {
            $log->addExtra('file', $error->getFile());
            $log->addExtra('line', $error->getLine());
            $log->addExtra('trace', $error->getTraceAsString());
-            $log->addExtra('detailedTrace', $error->getTrace());

            $log->setAction($action);

@@ -258,34 +204,22 @@ CLI::setResource('logError', function (Registry $register) {
                Console::error('Error pushing log: ' . $th->getMessage());
            }
        }
+
+        Console::warning("Failed: {$error->getMessage()}");
+        Console::warning($error->getTraceAsString());
    };
 }, ['register']);

-CLI::setResource('executor', fn () => new Executor(fn (string $projectId, string $deploymentId) => System::getEnv('_APP_EXECUTOR_HOST')));
-
 $platform = new Appwrite();
-$args = $platform->getEnv('argv');
-
-if (!isset($args[0])) {
-    Console::error('Missing task name');
-    Console::exit(1);
-}
-
-\array_shift($args);
-$taskName = $args[0];
 $platform->init(Service::TYPE_TASK);
+
 $cli = $platform->getCli();

 $cli
    ->error()
    ->inject('error')
-    ->inject('logError')
-    ->action(function (Throwable $error, callable $logError) use ($taskName) {
-        call_user_func_array($logError, [
-            $error,
-            'Task',
-            $taskName,
-        ]);
+    ->action(function (Throwable $error) {
+        Console::error($error->getMessage());
    });

 $cli->run();
@@ -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']
 ];
@@ -1,126 +0,0 @@
-<?php
-
-use Utopia\Database\Database;
-use Utopia\Database\Helpers\ID;
-
-return [
-    'collections' => [
-        '$collection' => ID::custom('databases'),
-        '$id' => ID::custom('collections'),
-        'name' => 'Collections',
-        'attributes' => [
-            [
-                '$id' => ID::custom('databaseInternalId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                '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('name'),
-                'type' => Database::VAR_STRING,
-                'size' => 256,
-                'required' => true,
-                'signed' => true,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('enabled'),
-                'type' => Database::VAR_BOOLEAN,
-                'signed' => true,
-                'size' => 0,
-                'format' => '',
-                'filters' => [],
-                'required' => true,
-                'default' => null,
-                'array' => false,
-            ],
-            [
-                '$id' => ID::custom('documentSecurity'),
-                'type' => Database::VAR_BOOLEAN,
-                'signed' => true,
-                'size' => 0,
-                'format' => '',
-                'filters' => [],
-                'required' => true,
-                'default' => null,
-                'array' => false,
-            ],
-            [
-                '$id' => ID::custom('attributes'),
-                'type' => Database::VAR_STRING,
-                'size' => 1000000,
-                'required' => false,
-                'signed' => true,
-                'array' => false,
-                'filters' => ['subQueryAttributes'],
-            ],
-            [
-                '$id' => ID::custom('indexes'),
-                'type' => Database::VAR_STRING,
-                'size' => 1000000,
-                'required' => false,
-                'signed' => true,
-                'array' => false,
-                'filters' => ['subQueryIndexes'],
-            ],
-            [
-                '$id' => ID::custom('search'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-        ],
-        'indexes' => [
-            [
-                '$id' => ID::custom('_fulltext_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_documentSecurity'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['documentSecurity'],
-                'lengths' => [],
-                'orders' => [Database::ORDER_ASC],
-            ],
-        ],
-    ]
-];
@@ -1,94 +0,0 @@
-<?php
-
-use Utopia\Database\Database;
-use Utopia\Database\Helpers\ID;
-
-$logsCollection = [];
-
-$logsCollection['stats'] = [
-    '$collection' => ID::custom(Database::METADATA),
-    '$id' => ID::custom('stats'),
-    'name' => 'stats',
-    'attributes' => [
-        [
-            '$id' => ID::custom('metric'),
-            'type' => Database::VAR_STRING,
-            'format' => '',
-            'size' => 255,
-            'signed' => true,
-            'required' => true,
-            'default' => null,
-            'array' => false,
-            'filters' => [],
-        ],
-        [
-            '$id' => ID::custom('region'),
-            'type' => Database::VAR_STRING,
-            'format' => '',
-            'size' => 255,
-            'signed' => true,
-            'required' => true,
-            'default' => null,
-            'array' => false,
-            'filters' => [],
-        ],
-        [
-            '$id' => ID::custom('value'),
-            'type' => Database::VAR_INTEGER,
-            'format' => '',
-            'size' => 8,
-            'signed' => true,
-            'required' => true,
-            'default' => null,
-            'array' => false,
-            'filters' => [],
-        ],
-        [
-            '$id' => ID::custom('time'),
-            'type' => Database::VAR_DATETIME,
-            'format' => '',
-            'size' => 0,
-            'signed' => false,
-            'required' => false,
-            'default' => null,
-            'array' => false,
-            'filters' => ['datetime'],
-        ],
-        [
-            '$id' => ID::custom('period'),
-            'type' => Database::VAR_STRING,
-            'format' => '',
-            'size' => 4,
-            'signed' => true,
-            'required' => true,
-            'default' => null,
-            'array' => false,
-            'filters' => [],
-        ],
-    ],
-    'indexes' => [
-        [
-            '$id' => ID::custom('_key_time'),
-            'type' => Database::INDEX_KEY,
-            'attributes' => ['time'],
-            'lengths' => [],
-            'orders' => [Database::ORDER_DESC],
-        ],
-        [
-            '$id' => ID::custom('_key_period_time'),
-            'type' => Database::INDEX_KEY,
-            'attributes' => ['period', 'time'],
-            'lengths' => [],
-            'orders' => [Database::ORDER_ASC],
-        ],
-        [
-            '$id' => ID::custom('_key_metric_period_time'),
-            'type' => Database::INDEX_UNIQUE,
-            'attributes' => ['metric', 'period', 'time'],
-            'lengths' => [],
-            'orders' => [Database::ORDER_DESC],
-        ],
-    ],
-];
-
-return $logsCollection;
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Initializes console project document.
- */
-
-use Appwrite\Auth\Auth;
-use Appwrite\Network\Validator\Origin;
-use Utopia\Database\Helpers\ID;
-use Utopia\System\System;
-
-$console = [
-    '$id' => ID::custom('console'),
-    '$internalId' => ID::custom('console'),
-    'name' => 'Appwrite',
-    '$collection' => ID::custom('projects'),
-    'description' => 'Appwrite core engine',
-    'logo' => '',
-    'teamId' => null,
-    'webhooks' => [],
-    'keys' => [],
-    'platforms' => [
-        [
-            '$collection' => ID::custom('platforms'),
-            'name' => 'Localhost',
-            'type' => Origin::CLIENT_TYPE_WEB,
-            'hostname' => 'localhost',
-        ], // Current host is added on app init
-    ],
-    'region' => 'fra',
-    'legalName' => '',
-    'legalCountry' => '',
-    'legalState' => '',
-    'legalCity' => '',
-    'legalAddress' => '',
-    'legalTaxId' => '',
-    'auths' => [
-        'mockNumbers' => [],
-        'invites' => System::getEnv('_APP_CONSOLE_INVITES', 'enabled') === 'enabled',
-        'limit' => (System::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled') === 'enabled') ? 1 : 0, // limit signup to 1 user
-        'duration' => Auth::TOKEN_EXPIRATION_LOGIN_LONG, // 1 Year in seconds
-        'sessionAlerts' => System::getEnv('_APP_CONSOLE_SESSION_ALERTS', 'disabled') === 'enabled'
-    ],
-    'authWhitelistEmails' => (!empty(System::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null))) ? \explode(',', System::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null)) : [],
-    'authWhitelistIPs' => (!empty(System::getEnv('_APP_CONSOLE_WHITELIST_IPS', null))) ? \explode(',', System::getEnv('_APP_CONSOLE_WHITELIST_IPS', null)) : [],
-    'oAuthProviders' => [
-        'githubEnabled' => true,
-        'githubSecret' => System::getEnv('_APP_CONSOLE_GITHUB_SECRET', ''),
-        'githubAppid' => System::getEnv('_APP_CONSOLE_GITHUB_APP_ID', '')
-    ],
-];
-
-return $console;
@@ -349,6 +349,11 @@ return [
        'description' => 'Team with the requested ID could not be found.',
        'code' => 404,
    ],
+    Exception::TEAM_INVITE_ALREADY_EXISTS => [
+        'name' => Exception::TEAM_INVITE_ALREADY_EXISTS,
+        'description' => 'User has already been invited or is already a member of this team',
+        'code' => 409,
+    ],
    Exception::TEAM_INVITE_NOT_FOUND => [
        'name' => Exception::TEAM_INVITE_NOT_FOUND,
        'description' => 'The requested team invitation could not be found.',
@@ -356,7 +361,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 => [
@@ -535,6 +540,23 @@ return [
        'code' => 404,
    ],

+    /** Sites */
+    Exception::SITE_NOT_FOUND => [
+        'name' => Exception::SITE_NOT_FOUND,
+        'description' => 'Site with the requested ID could not be found.',
+        'code' => 404,
+    ],
+    Exception::SITE_FRAMEWORK_UNSUPPORTED => [
+        'name' => Exception::SITE_FRAMEWORK_UNSUPPORTED,
+        'description' => 'The requested framework is either inactive or unsupported. Please check the value of the _APP_SITES_FRAMEWORKS environment variable.',
+        'code' => 404,
+    ],
+    Exception::SITE_TEMPLATE_NOT_FOUND => [
+        'name' => Exception::SITE_TEMPLATE_NOT_FOUND,
+        'description' => 'Site Template with the requested ID could not be found.',
+        'code' => 404,
+    ],
+
    /** Builds  */
    Exception::BUILD_NOT_FOUND => [
        'name' => Exception::BUILD_NOT_FOUND,
@@ -593,11 +615,6 @@ return [
        'description' => 'Database timed out. Try adjusting your queries or adding an index.',
        'code' => 408
    ],
-    Exception::DATABASE_QUERY_ORDER_NULL => [
-        'name' => Exception::DATABASE_QUERY_ORDER_NULL,
-        'description' => 'The order attribute had a null value. Cursor pagination requires all documents order attribute values are non-null.',
-        'code' => 400,
-    ],

    /** Collections */
    Exception::COLLECTION_NOT_FOUND => [
@@ -686,7 +703,7 @@ return [
    ],
    Exception::ATTRIBUTE_LIMIT_EXCEEDED => [
        'name' => Exception::ATTRIBUTE_LIMIT_EXCEEDED,
-        'description' => 'The maximum number or size of attributes for this collection has been reached.',
+        'description' => 'The maximum number of attributes has been reached.',
        'code' => 400,
    ],
    Exception::ATTRIBUTE_VALUE_INVALID => [
@@ -731,11 +748,6 @@ return [
        'description' => 'Index invalid.',
        'code' => 400,
    ],
-    Exception::INDEX_DEPENDENCY => [
-        'name' => Exception::INDEX_DEPENDENCY,
-        'description' => 'Attribute cannot be renamed or deleted. Please remove the associated index first.',
-        'code' => 409,
-    ],

    /** Project Errors */
    Exception::PROJECT_NOT_FOUND => [
@@ -217,6 +217,34 @@ return [
            ],
        ]
    ],
+    'sites' => [
+        '$model' => Response::MODEL_SITE,
+        '$resource' => true,
+        '$description' => 'This event triggers on any sites event.',
+        'deployments' => [
+            '$model' => Response::MODEL_DEPLOYMENT,
+            '$resource' => true,
+            '$description' => 'This event triggers on any deployments event.',
+            'create' => [
+                '$description' => 'This event triggers when a deployment is created.',
+            ],
+            'delete' => [
+                '$description' => 'This event triggers when a deployment is deleted.'
+            ],
+            'update' => [
+                '$description' => 'This event triggers when a deployment is updated.'
+            ],
+        ],
+        'create' => [
+            '$description' => 'This event triggers when a site is created.'
+        ],
+        'delete' => [
+            '$description' => 'This event triggers when a site is deleted.',
+        ],
+        'update' => [
+            '$description' => 'This event triggers when a site is updated.',
+        ]
+    ],
    'functions' => [
        '$model' => Response::MODEL_FUNCTION,
        '$resource' => true,
@@ -0,0 +1,45 @@
+<?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 [
+    'sveltekit' => [
+        'key' => 'sveltekit',
+        'name' => 'SvelteKit',
+        'defaultServeRuntime' => 'node-22',
+        'serveRuntimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'defaultBuildRuntime' => 'node-22',
+        'buildRuntimes' => getVersions($templateRuntimes['NODE']['versions'], 'node')
+    ],
+    'nextjs' => [
+        'key' => 'nextjs',
+        'name' => 'Next.js',
+        'defaultServeRuntime' => 'node-22',
+        'serveRuntimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
+        'defaultBuildRuntime' => 'node-22',
+        'buildRuntimes' => getVersions($templateRuntimes['NODE']['versions'], 'node')
+    ],
+    'static' => [
+        'key' => 'static',
+        'name' => 'Static',
+        'defaultServeRuntime' => 'static-1',
+        'serveRuntimes' => [
+            'static-1'
+        ],
+        'defaultBuildRuntime' => 'node-22',
+        'buildRuntimes' => getVersions($templateRuntimes['NODE']['versions'], 'node')
+    ]
+];
@@ -1,39 +1,8 @@
 <?php

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

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

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

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

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

-return [
-    // Accepted inputs files
-    "jpg" => "image/jpeg",
-    "jpeg" => "image/jpeg",
-    "gif" => "image/gif",
-    "png" => "image/png",
-    "heic" => "image/heic",
-    "webp" => "image/webp",
+return [ // Accepted inputs files
+    'jpg' => 'image/jpeg',
+    'jpeg' => 'image/jpeg',
+    'gif' => 'image/gif',
+    'png' => 'image/png',
 ];
@@ -1,71 +1,70 @@
 <?php

 return [
-    "image/jpeg",
-    "image/jpeg",
-    "image/gif",
-    "image/png",
-    "image/webp",
-    "image/heic",
-    "image/heic-sequence",
-    "image/avif",
+    'image/jpeg',
+    'image/jpeg',
+    'image/gif',
+    'image/png',
+    'image/webp',
+    // 'image/heic',
+    'image/avif',

    // Video Files
-    "video/mp4",
-    "video/x-flv",
-    "video/webm",
-    "application/x-mpegURL",
-    "video/MP2T",
-    "video/3gpp",
-    "video/quicktime",
-    "video/x-msvideo",
-    "video/x-ms-wmv",
+    'video/mp4',
+    'video/x-flv',
+    'video/webm',
+    'application/x-mpegURL',
+    'video/MP2T',
+    'video/3gpp',
+    'video/quicktime',
+    'video/x-msvideo',
+    'video/x-ms-wmv',

    // Audio Files

-    "audio/basic", // au snd RFC 2046
-    "auido/L24", // Linear PCM RFC 3190
-    "audio/mid", // mid rmi
-    "audio/mpeg", // mp3 RFC 3003
-    "audio/mp4", // mp4 audio
-    "audio/x-aiff", // aif aifc aiff
-    "audio/x-mpegurl", // m3u
-    "audio/vnd.rn-realaudio", // ra ram
-    "audio/ogg", // Ogg Vorbis RFC 5334
-    "audio/vorbis", // Vorbis RFC 5215
-    "audio/vnd.wav", // wav RFC 2361
-    "audio/x-wav", // php reads .wav as this - https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
-    "audio/aac", //AAC audio
-    "audio/x-hx-aac-adts", // AAC audio
+    'audio/basic', // au snd RFC 2046
+    'auido/L24', // Linear PCM RFC 3190
+    'audio/mid', // mid rmi
+    'audio/mpeg', // mp3 RFC 3003
+    'audio/mp4', // mp4 audio
+    'audio/x-aiff', // aif aifc aiff
+    'audio/x-mpegurl', // m3u
+    'audio/vnd.rn-realaudio', // ra ram
+    'audio/ogg', // Ogg Vorbis RFC 5334
+    'audio/vorbis', // Vorbis RFC 5215
+    'audio/vnd.wav', // wav RFC 2361
+    'audio/x-wav', // php reads .wav as this - https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
+    'audio/aac', //AAC audio
+    'audio/x-hx-aac-adts', // AAC audio

    // Microsoft Word
-    "application/msword",
-    "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-    "application/vnd.openxmlformats-officedocument.wordprocessingml.template",
-    "application/vnd.ms-word.document.macroEnabled.12",
+    'application/msword',
+    'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+    'application/vnd.ms-word.document.macroEnabled.12',

    // Microsoft Excel
-    "application/vnd.ms-excel",
-    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-    "application/vnd.openxmlformats-officedocument.spreadsheetml.template",
-    "application/vnd.ms-excel.sheet.macroEnabled.12",
-    "application/vnd.ms-excel.template.macroEnabled.12",
-    "application/vnd.ms-excel.addin.macroEnabled.12",
-    "application/vnd.ms-excel.sheet.binary.macroEnabled.12",
+    'application/vnd.ms-excel',
+    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+    'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+    'application/vnd.ms-excel.sheet.macroEnabled.12',
+    'application/vnd.ms-excel.template.macroEnabled.12',
+    'application/vnd.ms-excel.addin.macroEnabled.12',
+    'application/vnd.ms-excel.sheet.binary.macroEnabled.12',

    // Microsoft Power Point
-    "application/vnd.ms-powerpoint",
-    "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-    "application/vnd.openxmlformats-officedocument.presentationml.template",
-    "application/vnd.openxmlformats-officedocument.presentationml.slideshow",
-    "application/vnd.ms-powerpoint.addin.macroEnabled.12",
-    "application/vnd.ms-powerpoint.presentation.macroEnabled.12",
-    "application/vnd.ms-powerpoint.template.macroEnabled.12",
-    "application/vnd.ms-powerpoint.slideshow.macroEnabled.12",
+    'application/vnd.ms-powerpoint',
+    'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+    'application/vnd.openxmlformats-officedocument.presentationml.template',
+    'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+    'application/vnd.ms-powerpoint.addin.macroEnabled.12',
+    'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+    'application/vnd.ms-powerpoint.template.macroEnabled.12',
+    'application/vnd.ms-powerpoint.slideshow.macroEnabled.12',

    // Microsoft Access
-    "application/vnd.ms-access",
+    'application/vnd.ms-access',

    // Adobe PDF
-    "application/pdf",
+    'application/pdf',
 ];
@@ -1,12 +1,12 @@
 <?php

-return [
-    // Accepted outputs files
-    "jpg" => "image/jpeg",
-    "jpeg" => "image/jpeg",
-    "gif" => "image/gif",
-    "png" => "image/png",
-    "webp" => "image/webp",
-    "heic" => "image/heic",
-    "avif" => "image/avif",
+return [ // Accepted outputs files
+    'jpg' => 'image/jpeg',
+    'jpeg' => 'image/jpeg',
+    'gif' => 'image/gif',
+    'png' => 'image/png',
+    'webp' => 'image/webp',
+    // 'heic' => 'image/heic',
+    // 'heics' => 'image/heic',
+    'avif'  => 'image/avif'
 ];
@@ -0,0 +1,36 @@
+<?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']
+    ],
+];
@@ -79,15 +79,6 @@ return [
                'question' => 'Enter your Appwrite hostname',
                'filter' => ''
            ],
-            [
-                'name' => '_APP_CUSTOM_DOMAIN_DENY_LIST',
-                'description' => 'List of reserved or prohibited domains when configuring custom domains.',
-                'introduction' => '',
-                'default' => 'example.com,test.com,app.example.com',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
            [
                'name' => '_APP_DOMAIN_FUNCTIONS',
                'description' => 'A domain to use for function preview URLs. Setting to empty turns off function preview URLs.',
@@ -277,24 +268,6 @@ return [
                'question' => '',
                'filter' => ''
            ],
-            [
-                'name' => '_APP_COMPRESSION_ENABLED',
-                'description' => 'This option allows you to enable or disable the response compression for the Appwrite API. It\'s enabled by default with value "enabled", and to disable it, pass value "disabled".',
-                'introduction' => '1.6.0',
-                'default' => 'enabled',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
-            [
-                'name' => '_APP_COMPRESSION_MIN_SIZE_BYTES',
-                'description' => 'This option allows you to set the minimum size in bytes for the response compression to be applied. The default value is 1024 bytes.',
-                'introduction' => '1.6.0',
-                'default' => 1024,
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ]
        ],
    ],
    [
@@ -581,7 +554,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,
@@ -589,7 +562,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,
@@ -597,7 +570,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,
@@ -605,20 +578,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.',
@@ -800,7 +765,7 @@ return [
            ],
            [
                'name' => '_APP_FUNCTIONS_CPUS',
-                'description' => 'The maximum number of CPU core a single cloud function is allowed to use. Please note that setting a value higher than available cores will result in a function error, which might result in an error. The default value is empty. When it\'s empty or 0, CPU limit will be disabled.',
+                'description' => 'The maximum number of CPU core a single cloud function is allowed to use. Please note that setting a value higher than available cores will result in a function error, which might result in an error. The default value is empty. When it\'s empty, CPU limit will be disabled.',
                'introduction' => '0.7.0',
                'default' => '0',
                'required' => false,
@@ -809,7 +774,7 @@ return [
            ],
            [
                'name' => '_APP_FUNCTIONS_MEMORY',
-                'description' => 'The maximum amount of memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty or 0, memory limit will be disabled.',
+                'description' => 'The maximum amount of memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty, memory limit will be disabled.',
                'introduction' => '0.7.0',
                'default' => '0',
                'required' => false,
@@ -1057,22 +1022,13 @@ return [
            ],
            [
                'name' => '_APP_MAINTENANCE_RETENTION_AUDIT',
-                'description' => 'The maximum duration (in seconds) upto which to retain audit logs. The default value is 1209600 seconds (14 days).',
+                'description' => 'IThe maximum duration (in seconds) upto which to retain audit logs. The default value is 1209600 seconds (14 days).',
                'introduction' => '0.7.0',
                'default' => '1209600',
                'required' => false,
                'question' => '',
                'filter' => ''
            ],
-            [
-                'name' => '_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE',
-                'description' => 'The maximum duration (in seconds) upto which to retain console audit logs. The default value is 15778800 seconds (6 months).',
-                'introduction' => '1.6.2',
-                'default' => '15778800',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
            [
                'name' => '_APP_MAINTENANCE_RETENTION_ABUSE',
                'description' => 'The maximum duration (in seconds) upto which to retain abuse logs. The default value is 86400 seconds (1 day).',
@@ -1,11 +1,6 @@
 <?php

 use Appwrite\Extend\Exception;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\MethodType;
-use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\URL\URL as URLParse;
 use Appwrite\Utopia\Response;
 use chillerlan\QRCode\QRCode;
@@ -66,9 +61,9 @@ $avatarCallback = function (string $type, string $code, int $width, int $height,
    unset($image);
 };

-$getUserGitHub = function (string $userId, Document $project, Database $dbForProject, Database $dbForPlatform, ?Logger $logger) {
+$getUserGitHub = function (string $userId, Document $project, Database $dbForProject, Database $dbForConsole, ?Logger $logger) {
    try {
-        $user = Authorization::skip(fn () => $dbForPlatform->getDocument('users', $userId));
+        $user = Authorization::skip(fn () => $dbForConsole->getDocument('users', $userId));

        $sessions = $user->getAttribute('sessions', []);

@@ -127,7 +122,7 @@ $getUserGitHub = function (string $userId, Document $project, Database $dbForPro
                do {
                    $previousAccessToken = $gitHubSession->getAttribute('providerAccessToken');

-                    $user = Authorization::skip(fn () => $dbForPlatform->getDocument('users', $userId));
+                    $user = Authorization::skip(fn () => $dbForConsole->getDocument('users', $userId));
                    $sessions = $user->getAttribute('sessions', []);

                    $gitHubSession = new Document();
@@ -169,21 +164,13 @@ App::get('/v1/avatars/credit-cards/:code')
    ->label('scope', 'avatars.read')
    ->label('cache', true)
    ->label('cache.resource', 'avatar/credit-card')
-    ->label('sdk', new Method(
-        namespace: 'avatars',
-        group: null,
-        name: 'getCreditCard',
-        description: '/docs/references/avatars/get-credit-card.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        type: MethodType::LOCATION,
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        contentType: ContentType::IMAGE_PNG
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'avatars')
+    ->label('sdk.method', 'getCreditCard')
+    ->label('sdk.methodType', 'location')
+    ->label('sdk.description', '/docs/references/avatars/get-credit-card.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_IMAGE_PNG)
    ->param('code', '', new WhiteList(\array_keys(Config::getParam('avatar-credit-cards'))), 'Credit Card Code. Possible values: ' . \implode(', ', \array_keys(Config::getParam('avatar-credit-cards'))) . '.')
    ->param('width', 100, new Range(0, 2000), 'Image width. Pass an integer between 0 to 2000. Defaults to 100.', true)
    ->param('height', 100, new Range(0, 2000), 'Image height. Pass an integer between 0 to 2000. Defaults to 100.', true)
@@ -197,21 +184,13 @@ App::get('/v1/avatars/browsers/:code')
    ->label('scope', 'avatars.read')
    ->label('cache', true)
    ->label('cache.resource', 'avatar/browser')
-    ->label('sdk', new Method(
-        namespace: 'avatars',
-        group: null,
-        name: 'getBrowser',
-        description: '/docs/references/avatars/get-browser.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        type: MethodType::LOCATION,
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        contentType: ContentType::IMAGE_PNG
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'avatars')
+    ->label('sdk.method', 'getBrowser')
+    ->label('sdk.methodType', 'location')
+    ->label('sdk.description', '/docs/references/avatars/get-browser.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_IMAGE_PNG)
    ->param('code', '', new WhiteList(\array_keys(Config::getParam('avatar-browsers'))), 'Browser Code.')
    ->param('width', 100, new Range(0, 2000), 'Image width. Pass an integer between 0 to 2000. Defaults to 100.', true)
    ->param('height', 100, new Range(0, 2000), 'Image height. Pass an integer between 0 to 2000. Defaults to 100.', true)
@@ -225,21 +204,13 @@ App::get('/v1/avatars/flags/:code')
    ->label('scope', 'avatars.read')
    ->label('cache', true)
    ->label('cache.resource', 'avatar/flag')
-    ->label('sdk', new Method(
-        namespace: 'avatars',
-        group: null,
-        name: 'getFlag',
-        description: '/docs/references/avatars/get-flag.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        type: MethodType::LOCATION,
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        contentType: ContentType::IMAGE_PNG
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'avatars')
+    ->label('sdk.method', 'getFlag')
+    ->label('sdk.methodType', 'location')
+    ->label('sdk.description', '/docs/references/avatars/get-flag.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_IMAGE_PNG)
    ->param('code', '', new WhiteList(\array_keys(Config::getParam('avatar-flags'))), 'Country Code. ISO Alpha-2 country code format.')
    ->param('width', 100, new Range(0, 2000), 'Image width. Pass an integer between 0 to 2000. Defaults to 100.', true)
    ->param('height', 100, new Range(0, 2000), 'Image height. Pass an integer between 0 to 2000. Defaults to 100.', true)
@@ -253,21 +224,13 @@ App::get('/v1/avatars/image')
    ->label('scope', 'avatars.read')
    ->label('cache', true)
    ->label('cache.resource', 'avatar/image')
-    ->label('sdk', new Method(
-        namespace: 'avatars',
-        group: null,
-        name: 'getImage',
-        description: '/docs/references/avatars/get-image.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        type: MethodType::LOCATION,
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        contentType: ContentType::IMAGE
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'avatars')
+    ->label('sdk.method', 'getImage')
+    ->label('sdk.methodType', 'location')
+    ->label('sdk.description', '/docs/references/avatars/get-image.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_IMAGE)
    ->param('url', '', new URL(['http', 'https']), 'Image URL which you want to crop.')
    ->param('width', 400, new Range(0, 2000), 'Resize preview image width, Pass an integer between 0 to 2000. Defaults to 400.', true)
    ->param('height', 400, new Range(0, 2000), 'Resize preview image height, Pass an integer between 0 to 2000. Defaults to 400.', true)
@@ -324,21 +287,13 @@ App::get('/v1/avatars/favicon')
    ->label('scope', 'avatars.read')
    ->label('cache', true)
    ->label('cache.resource', 'avatar/favicon')
-    ->label('sdk', new Method(
-        namespace: 'avatars',
-        group: null,
-        name: 'getFavicon',
-        description: '/docs/references/avatars/get-favicon.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        type: MethodType::LOCATION,
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        contentType: ContentType::IMAGE
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'avatars')
+    ->label('sdk.method', 'getFavicon')
+    ->label('sdk.methodType', 'location')
+    ->label('sdk.description', '/docs/references/avatars/get-favicon.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_IMAGE)
    ->param('url', '', new URL(['http', 'https']), 'Website URL which you want to fetch the favicon from.')
    ->inject('response')
    ->action(function (string $url, Response $response) {
@@ -475,21 +430,13 @@ App::get('/v1/avatars/qr')
    ->desc('Get QR code')
    ->groups(['api', 'avatars'])
    ->label('scope', 'avatars.read')
-    ->label('sdk', new Method(
-        namespace: 'avatars',
-        group: null,
-        name: 'getQR',
-        description: '/docs/references/avatars/get-qr.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        type: MethodType::LOCATION,
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        contentType: ContentType::IMAGE_PNG
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'avatars')
+    ->label('sdk.method', 'getQR')
+    ->label('sdk.methodType', 'location')
+    ->label('sdk.description', '/docs/references/avatars/get-qr.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_IMAGE_PNG)
    ->param('text', '', new Text(512), 'Plain text to be converted to QR code image.')
    ->param('size', 400, new Range(1, 1000), 'QR code size. Pass an integer between 1 to 1000. Defaults to 400.', true)
    ->param('margin', 1, new Range(0, 10), 'Margin from edge. Pass an integer between 0 to 10. Defaults to 1.', true)
@@ -524,21 +471,13 @@ App::get('/v1/avatars/initials')
    ->groups(['api', 'avatars'])
    ->label('scope', 'avatars.read')
    ->label('cache.resource', 'avatar/initials')
-    ->label('sdk', new Method(
-        namespace: 'avatars',
-        group: null,
-        name: 'getInitials',
-        description: '/docs/references/avatars/get-initials.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        type: MethodType::LOCATION,
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        contentType: ContentType::IMAGE_PNG
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'avatars')
+    ->label('sdk.method', 'getInitials')
+    ->label('sdk.methodType', 'location')
+    ->label('sdk.description', '/docs/references/avatars/get-initials.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_IMAGE_PNG)
    ->param('name', '', new Text(128), 'Full Name. When empty, current user name or email will be used. Max length: 128 chars.', true)
    ->param('width', 500, new Range(0, 2000), 'Image width. Pass an integer between 0 to 2000. Defaults to 100.', true)
    ->param('height', 500, new Range(0, 2000), 'Image height. Pass an integer between 0 to 2000. Defaults to 100.', true)
@@ -626,14 +565,14 @@ App::get('/v1/cards/cloud')
    ->inject('user')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('dbForPlatform')
+    ->inject('dbForConsole')
    ->inject('response')
    ->inject('heroes')
    ->inject('contributors')
    ->inject('employees')
    ->inject('logger')
-    ->action(function (string $userId, string $mock, int $width, int $height, Document $user, Document $project, Database $dbForProject, Database $dbForPlatform, Response $response, array $heroes, array $contributors, array $employees, ?Logger $logger) use ($getUserGitHub) {
-        $user = Authorization::skip(fn () => $dbForPlatform->getDocument('users', $userId));
+    ->action(function (string $userId, string $mock, int $width, int $height, Document $user, Document $project, Database $dbForProject, Database $dbForConsole, Response $response, array $heroes, array $contributors, array $employees, ?Logger $logger) use ($getUserGitHub) {
+        $user = Authorization::skip(fn () => $dbForConsole->getDocument('users', $userId));

        if ($user->isEmpty() && empty($mock)) {
            throw new Exception(Exception::USER_NOT_FOUND);
@@ -644,7 +583,7 @@ App::get('/v1/cards/cloud')
            $email = $user->getAttribute('email', '');
            $createdAt = new \DateTime($user->getCreatedAt());

-            $gitHub = $getUserGitHub($user->getId(), $project, $dbForProject, $dbForPlatform, $logger);
+            $gitHub = $getUserGitHub($user->getId(), $project, $dbForProject, $dbForConsole, $logger);
            $githubName = $gitHub['name'] ?? '';
            $githubId = $gitHub['id'] ?? '';

@@ -833,14 +772,14 @@ App::get('/v1/cards/cloud-back')
    ->inject('user')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('dbForPlatform')
+    ->inject('dbForConsole')
    ->inject('response')
    ->inject('heroes')
    ->inject('contributors')
    ->inject('employees')
    ->inject('logger')
-    ->action(function (string $userId, string $mock, int $width, int $height, Document $user, Document $project, Database $dbForProject, Database $dbForPlatform, Response $response, array $heroes, array $contributors, array $employees, ?Logger $logger) use ($getUserGitHub) {
-        $user = Authorization::skip(fn () => $dbForPlatform->getDocument('users', $userId));
+    ->action(function (string $userId, string $mock, int $width, int $height, Document $user, Document $project, Database $dbForProject, Database $dbForConsole, Response $response, array $heroes, array $contributors, array $employees, ?Logger $logger) use ($getUserGitHub) {
+        $user = Authorization::skip(fn () => $dbForConsole->getDocument('users', $userId));

        if ($user->isEmpty() && empty($mock)) {
            throw new Exception(Exception::USER_NOT_FOUND);
@@ -850,7 +789,7 @@ App::get('/v1/cards/cloud-back')
            $userId = $user->getId();
            $email = $user->getAttribute('email', '');

-            $gitHub = $getUserGitHub($user->getId(), $project, $dbForProject, $dbForPlatform, $logger);
+            $gitHub = $getUserGitHub($user->getId(), $project, $dbForProject, $dbForConsole, $logger);
            $githubId = $gitHub['id'] ?? '';

            $isHero = \array_key_exists($email, $heroes);
@@ -911,14 +850,14 @@ App::get('/v1/cards/cloud-og')
    ->inject('user')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('dbForPlatform')
+    ->inject('dbForConsole')
    ->inject('response')
    ->inject('heroes')
    ->inject('contributors')
    ->inject('employees')
    ->inject('logger')
-    ->action(function (string $userId, string $mock, int $width, int $height, Document $user, Document $project, Database $dbForProject, Database $dbForPlatform, Response $response, array $heroes, array $contributors, array $employees, ?Logger $logger) use ($getUserGitHub) {
-        $user = Authorization::skip(fn () => $dbForPlatform->getDocument('users', $userId));
+    ->action(function (string $userId, string $mock, int $width, int $height, Document $user, Document $project, Database $dbForProject, Database $dbForConsole, Response $response, array $heroes, array $contributors, array $employees, ?Logger $logger) use ($getUserGitHub) {
+        $user = Authorization::skip(fn () => $dbForConsole->getDocument('users', $userId));

        if ($user->isEmpty() && empty($mock)) {
            throw new Exception(Exception::USER_NOT_FOUND);
@@ -933,7 +872,7 @@ App::get('/v1/cards/cloud-og')
            $email = $user->getAttribute('email', '');
            $createdAt = new \DateTime($user->getCreatedAt());

-            $gitHub = $getUserGitHub($user->getId(), $project, $dbForProject, $dbForPlatform, $logger);
+            $gitHub = $getUserGitHub($user->getId(), $project, $dbForProject, $dbForConsole, $logger);
            $githubName = $gitHub['name'] ?? '';
            $githubId = $gitHub['id'] ?? '';

@@ -1,10 +1,6 @@
 <?php

 use Appwrite\Extend\Exception;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Database\Document;
@@ -25,20 +21,13 @@ App::get('/v1/console/variables')
    ->desc('Get variables')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.read')
-    ->label('sdk', new Method(
-        namespace: 'console',
-        group: 'console',
-        name: 'variables',
-        description: '/docs/references/console/variables.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_CONSOLE_VARIABLES,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'console')
+    ->label('sdk.method', 'variables')
+    ->label('sdk.description', '/docs/references/console/variables.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_CONSOLE_VARIABLES)
    ->inject('response')
    ->action(function (Response $response) {
        $isDomainEnabled = !empty(System::getEnv('_APP_DOMAIN', ''))
@@ -57,40 +46,34 @@ App::get('/v1/console/variables')
        $variables = new Document([
            '_APP_DOMAIN_TARGET' => System::getEnv('_APP_DOMAIN_TARGET'),
            '_APP_STORAGE_LIMIT' => +System::getEnv('_APP_STORAGE_LIMIT'),
-            '_APP_FUNCTIONS_SIZE_LIMIT' => +System::getEnv('_APP_FUNCTIONS_SIZE_LIMIT'),
+            '_APP_COMPUTE_SIZE_LIMIT' => +System::getEnv('_APP_COMPUTE_SIZE_LIMIT'),
            '_APP_USAGE_STATS' => System::getEnv('_APP_USAGE_STATS'),
            '_APP_VCS_ENABLED' => $isVcsEnabled,
            '_APP_DOMAIN_ENABLED' => $isDomainEnabled,
-            '_APP_ASSISTANT_ENABLED' => $isAssistantEnabled
+            '_APP_ASSISTANT_ENABLED' => $isAssistantEnabled,
+            '_APP_DOMAIN_SITES' => System::getEnv('_APP_DOMAIN_SITES'),
+            '_APP_OPTIONS_FORCE_HTTPS' => System::getEnv('_APP_OPTIONS_FORCE_HTTPS')
        ]);

        $response->dynamic($variables, Response::MODEL_CONSOLE_VARIABLES);
    });

 App::post('/v1/console/assistant')
-    ->desc('Create assistant query')
+    ->desc('Ask query')
    ->groups(['api', 'assistant'])
    ->label('scope', 'assistant.read')
-    ->label('sdk', new Method(
-        namespace: 'assistant',
-        group: 'console',
-        name: 'chat',
-        description: '/docs/references/assistant/chat.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        contentType: ContentType::TEXT
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'assistant')
+    ->label('sdk.method', 'chat')
+    ->label('sdk.description', '/docs/references/assistant/chat.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_TEXT)
    ->label('abuse-limit', 15)
    ->label('abuse-key', 'userId:{userId}')
    ->param('prompt', '', new Text(2000), 'Prompt. A string containing questions asked to the AI assistant.')
    ->inject('response')
    ->action(function (string $prompt, Response $response) {
-        $ch = curl_init('http://appwrite-assistant:3003/v1/models/assistant/prompt');
+        $ch = curl_init('http://appwrite-assistant:3003/');
        $responseHeaders = [];
        $query = json_encode(['prompt' => $prompt]);
        $headers = ['accept: text/event-stream'];
@@ -5,10 +5,6 @@ use Appwrite\Extend\Exception;
 use Appwrite\Extend\Exception as AppwriteException;
 use Appwrite\GraphQL\Promises\Adapter;
 use Appwrite\GraphQL\Schema;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\MethodType;
-use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use GraphQL\Error\DebugFlag;
@@ -42,20 +38,13 @@ App::get('/v1/graphql')
    ->desc('GraphQL endpoint')
    ->groups(['graphql'])
    ->label('scope', 'graphql')
-    ->label('sdk', new Method(
-        namespace: 'graphql',
-        group: 'graphql',
-        name: 'get',
-        auth: [AuthType::KEY, AuthType::SESSION, AuthType::JWT],
-        hide: true,
-        description: '/docs/references/graphql/get.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_ANY,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'graphql')
+    ->label('sdk.hide', true)
+    ->label('sdk.description', '/docs/references/graphql/get.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_ANY)
    ->label('abuse-limit', 60)
    ->label('abuse-time', 60)
    ->param('query', '', new Text(0, 0), 'The query to execute.')
@@ -89,23 +78,17 @@ App::post('/v1/graphql/mutation')
    ->desc('GraphQL endpoint')
    ->groups(['graphql'])
    ->label('scope', 'graphql')
-    ->label('sdk', new Method(
-        namespace: 'graphql',
-        group: 'graphql',
-        name: 'mutation',
-        auth: [AuthType::KEY, AuthType::SESSION, AuthType::JWT],
-        description: '/docs/references/graphql/post.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_ANY,
-            )
-        ],
-        type: MethodType::GRAPHQL,
-        additionalParameters: [
-            'query' => ['default' => [], 'validator' => new JSON(), 'description' => 'The query or queries to execute.', 'optional' => false],
-        ],
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'graphql')
+    ->label('sdk.method', 'mutation')
+    ->label('sdk.methodType', 'graphql')
+    ->label('sdk.description', '/docs/references/graphql/post.md')
+    ->label('sdk.parameters', [
+        'query' => ['default' => [], 'validator' => new JSON(), 'description' => 'The query or queries to execute.', 'optional' => false],
+    ])
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_ANY)
    ->label('abuse-limit', 60)
    ->label('abuse-time', 60)
    ->inject('request')
@@ -140,23 +123,17 @@ App::post('/v1/graphql')
    ->desc('GraphQL endpoint')
    ->groups(['graphql'])
    ->label('scope', 'graphql')
-    ->label('sdk', new Method(
-        namespace: 'graphql',
-        group: 'graphql',
-        name: 'query',
-        auth: [AuthType::KEY, AuthType::SESSION, AuthType::JWT],
-        description: '/docs/references/graphql/post.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_ANY,
-            )
-        ],
-        type: MethodType::GRAPHQL,
-        additionalParameters: [
-            'query' => ['default' => [], 'validator' => new JSON(), 'description' => 'The query or queries to execute.', 'optional' => false],
-        ],
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'graphql')
+    ->label('sdk.method', 'query')
+    ->label('sdk.methodType', 'graphql')
+    ->label('sdk.description', '/docs/references/graphql/post.md')
+    ->label('sdk.parameters', [
+        'query' => ['default' => [], 'validator' => new JSON(), 'description' => 'The query or queries to execute.', 'optional' => false],
+    ])
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_ANY)
    ->label('abuse-limit', 60)
    ->label('abuse-time', 60)
    ->inject('request')
@@ -3,18 +3,14 @@
 use Appwrite\ClamAV\Network;
 use Appwrite\Event\Event;
 use Appwrite\Extend\Exception;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Response;
 use Utopia\App;
 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;
@@ -30,20 +26,13 @@ App::get('/v1/health')
    ->desc('Get HTTP')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        namespace: 'health',
-        group: 'health',
-        name: 'get',
-        auth: [AuthType::KEY],
-        description: '/docs/references/health/get.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_STATUS,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'get')
+    ->label('sdk.description', '/docs/references/health/get.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
    ->inject('response')
    ->action(function (Response $response) {

@@ -60,6 +49,9 @@ App::get('/v1/health/version')
    ->desc('Get version')
    ->groups(['api', 'health'])
    ->label('scope', 'public')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_VERSION)
    ->inject('response')
    ->action(function (Response $response) {
        $response->dynamic(new Document([ 'version' => APP_VERSION_STABLE ]), Response::MODEL_HEALTH_VERSION);
@@ -69,20 +61,13 @@ App::get('/v1/health/db')
    ->desc('Get DB')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'health',
-        name: 'getDB',
-        description: '/docs/references/health/get-db.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_STATUS,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getDB')
+    ->label('sdk.description', '/docs/references/health/get-db.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
    ->inject('response')
    ->inject('pools')
    ->action(function (Response $response, Group $pools) {
@@ -130,20 +115,13 @@ App::get('/v1/health/cache')
    ->desc('Get cache')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'health',
-        name: 'getCache',
-        description: '/docs/references/health/get-cache.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_STATUS,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getCache')
+    ->label('sdk.description', '/docs/references/health/get-cache.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
    ->inject('response')
    ->inject('pools')
    ->action(function (Response $response, Group $pools) {
@@ -191,24 +169,74 @@ 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.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueue')
+    ->label('sdk.description', '/docs/references/health/get-queue.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
+    ->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'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'health',
-        name: 'getPubSub',
-        description: '/docs/references/health/get-pubsub.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_STATUS,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getPubSub')
+    ->label('sdk.description', '/docs/references/health/get-pubsub.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
    ->inject('response')
    ->inject('pools')
    ->action(function (Response $response, Group $pools) {
@@ -260,20 +288,13 @@ App::get('/v1/health/time')
    ->desc('Get time')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'health',
-        name: 'getTime',
-        description: '/docs/references/health/get-time.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_TIME,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getTime')
+    ->label('sdk.description', '/docs/references/health/get-time.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_TIME)
    ->inject('response')
    ->action(function (Response $response) {

@@ -324,27 +345,21 @@ App::get('/v1/health/queue/webhooks')
    ->desc('Get webhooks queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'queue',
-        name: 'getQueueWebhooks',
-        description: '/docs/references/health/get-queue-webhooks.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_QUEUE,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueueWebhooks')
+    ->label('sdk.description', '/docs/references/health/get-queue-webhooks.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_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('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}.");
@@ -357,27 +372,21 @@ App::get('/v1/health/queue/logs')
    ->desc('Get logs queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'queue',
-        name: 'getQueueLogs',
-        description: '/docs/references/health/get-queue-logs.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_QUEUE,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueueLogs')
+    ->label('sdk.description', '/docs/references/health/get-queue-logs.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_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('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}.");
@@ -390,20 +399,13 @@ App::get('/v1/health/certificate')
    ->desc('Get the SSL certificate for a domain')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'health',
-        name: 'getCertificate',
-        description: '/docs/references/health/get-certificate.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_CERTIFICATE,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getCertificate')
+    ->label('sdk.description', '/docs/references/health/get-certificate.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_CERTIFICATE)
    ->param('domain', null, new Multiple([new Domain(), new PublicDomain()]), Multiple::TYPE_STRING, 'Domain name')
    ->inject('response')
    ->action(function (string $domain, Response $response) {
@@ -447,27 +449,21 @@ App::get('/v1/health/queue/certificates')
    ->desc('Get certificates queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'queue',
-        name: 'getQueueCertificates',
-        description: '/docs/references/health/get-queue-certificates.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_QUEUE,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueueCertificates')
+    ->label('sdk.description', '/docs/references/health/get-queue-certificates.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_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('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}.");
@@ -480,27 +476,21 @@ App::get('/v1/health/queue/builds')
    ->desc('Get builds queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'queue',
-        name: 'getQueueBuilds',
-        description: '/docs/references/health/get-queue-builds.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_QUEUE,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueueBuilds')
+    ->label('sdk.description', '/docs/references/health/get-queue-builds.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_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('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}.");
@@ -513,28 +503,22 @@ App::get('/v1/health/queue/databases')
    ->desc('Get databases queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'queue',
-        name: 'getQueueDatabases',
-        description: '/docs/references/health/get-queue-databases.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_QUEUE,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueueDatabases')
+    ->label('sdk.description', '/docs/references/health/get-queue-databases.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
    ->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}.");
@@ -547,27 +531,21 @@ App::get('/v1/health/queue/deletes')
    ->desc('Get deletes queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'queue',
-        name: 'getQueueDeletes',
-        description: '/docs/references/health/get-queue-deletes.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_QUEUE,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueueDeletes')
+    ->label('sdk.description', '/docs/references/health/get-queue-deletes.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_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('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}.");
@@ -580,27 +558,21 @@ App::get('/v1/health/queue/mails')
    ->desc('Get mails queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'queue',
-        name: 'getQueueMails',
-        description: '/docs/references/health/get-queue-mails.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_QUEUE,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueueMails')
+    ->label('sdk.description', '/docs/references/health/get-queue-mails.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_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('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}.");
@@ -613,27 +585,21 @@ App::get('/v1/health/queue/messaging')
    ->desc('Get messaging queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'queue',
-        name: 'getQueueMessaging',
-        description: '/docs/references/health/get-queue-messaging.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_QUEUE,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueueMessaging')
+    ->label('sdk.description', '/docs/references/health/get-queue-messaging.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_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('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,27 +612,21 @@ App::get('/v1/health/queue/migrations')
    ->desc('Get migrations queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'queue',
-        name: 'getQueueMigrations',
-        description: '/docs/references/health/get-queue-migrations.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_QUEUE,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueueMigrations')
+    ->label('sdk.description', '/docs/references/health/get-queue-migrations.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_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('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}.");
@@ -679,27 +639,21 @@ App::get('/v1/health/queue/functions')
    ->desc('Get functions queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'queue',
-        name: 'getQueueFunctions',
-        description: '/docs/references/health/get-queue-functions.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_QUEUE,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueueFunctions')
+    ->label('sdk.description', '/docs/references/health/get-queue-functions.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_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('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}.");
@@ -708,31 +662,25 @@ 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')
+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',
-        group: 'queue',
-        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
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueueUsage')
+    ->label('sdk.description', '/docs/references/health/get-queue-usage.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_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('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_RESOURCES_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}.");
@@ -741,31 +689,25 @@ App::get('/v1/health/queue/stats-resources')
        $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-dump')
+    ->desc('Get usage dump queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'queue',
-        name: 'getQueueUsage',
-        description: '/docs/references/health/get-queue-stats-usage.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_QUEUE,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueueUsageDump')
+    ->label('sdk.description', '/docs/references/health/get-queue-usage-dump.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_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('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_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}.");
@@ -778,20 +720,13 @@ App::get('/v1/health/storage/local')
    ->desc('Get local storage')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'storage',
-        name: 'getStorageLocal',
-        description: '/docs/references/health/get-storage-local.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_STATUS,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getStorageLocal')
+    ->label('sdk.description', '/docs/references/health/get-storage-local.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
    ->inject('response')
    ->action(function (Response $response) {

@@ -828,20 +763,13 @@ App::get('/v1/health/storage')
    ->desc('Get storage')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'storage',
-        name: 'getStorage',
-        description: '/docs/references/health/get-storage.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_STATUS,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getStorage')
+    ->label('sdk.description', '/docs/references/health/get-storage.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
    ->inject('response')
    ->inject('deviceForFiles')
    ->inject('deviceForFunctions')
@@ -876,20 +804,13 @@ App::get('/v1/health/anti-virus')
    ->desc('Get antivirus')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'health',
-        name: 'getAntivirus',
-        description: '/docs/references/health/get-storage-anti-virus.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_ANTIVIRUS,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getAntivirus')
+    ->label('sdk.description', '/docs/references/health/get-storage-anti-virus.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_ANTIVIRUS)
    ->inject('response')
    ->action(function (Response $response) {

@@ -922,28 +843,17 @@ App::get('/v1/health/queue/failed/:name')
    ->desc('Get number of failed queue jobs')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        group: 'queue',
-        name: 'getFailedJobs',
-        description: '/docs/references/health/get-failed-queue-jobs.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_QUEUE,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getFailedJobs')
    ->param('name', '', new WhiteList([
        Event::DATABASE_QUEUE_NAME,
        Event::DELETE_QUEUE_NAME,
        Event::AUDITS_QUEUE_NAME,
        Event::MAILS_QUEUE_NAME,
        Event::FUNCTIONS_QUEUE_NAME,
-        Event::STATS_RESOURCES_QUEUE_NAME,
-        Event::STATS_USAGE_QUEUE_NAME,
+        Event::USAGE_QUEUE_NAME,
+        Event::USAGE_DUMP_QUEUE_NAME,
        Event::WEBHOOK_QUEUE_NAME,
        Event::CERTIFICATES_QUEUE_NAME,
        Event::BUILDS_QUEUE_NAME,
@@ -951,12 +861,17 @@ App::get('/v1/health/queue/failed/:name')
        Event::MIGRATIONS_QUEUE_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)
+    ->label('sdk.description', '/docs/references/health/get-failed-queue-jobs.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
    ->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}.");
@@ -969,6 +884,9 @@ App::get('/v1/health/stats') // Currently only used internally
 ->desc('Get system stats')
    ->groups(['api', 'health'])
    ->label('scope', 'root')
+    // ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    // ->label('sdk.namespace', 'health')
+    // ->label('sdk.method', 'getStats')
    ->label('docs', false)
    ->inject('response')
    ->inject('register')
@@ -1,8 +1,5 @@
 <?php

-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use MaxMind\Db\Reader;
@@ -15,19 +12,15 @@ App::get('/v1/locale')
    ->desc('Get user locale')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
-    ->label('sdk', new Method(
-        namespace: 'locale',
-        group: null,
-        name: 'get',
-        description: '/docs/references/locale/get-locale.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_LOCALE,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'locale')
+    ->label('sdk.method', 'get')
+    ->label('sdk.description', '/docs/references/locale/get-locale.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_LOCALE)
+    ->label('sdk.offline.model', '/localed')
+    ->label('sdk.offline.key', 'current')
    ->inject('request')
    ->inject('response')
    ->inject('locale')
@@ -79,19 +72,15 @@ App::get('/v1/locale/codes')
    ->desc('List locale codes')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
-    ->label('sdk', new Method(
-        namespace: 'locale',
-        group: null,
-        name: 'listCodes',
-        description: '/docs/references/locale/list-locale-codes.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_LOCALE_CODE_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'locale')
+    ->label('sdk.method', 'listCodes')
+    ->label('sdk.description', '/docs/references/locale/list-locale-codes.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_LOCALE_CODE_LIST)
+    ->label('sdk.offline.model', '/locale/localeCode')
+    ->label('sdk.offline.key', 'current')
    ->inject('response')
    ->action(function (Response $response) {
        $codes = Config::getParam('locale-codes');
@@ -105,23 +94,19 @@ App::get('/v1/locale/countries')
    ->desc('List countries')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
-    ->label('sdk', new Method(
-        namespace: 'locale',
-        group: null,
-        name: 'listCountries',
-        description: '/docs/references/locale/list-countries.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_COUNTRY_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'locale')
+    ->label('sdk.method', 'listCountries')
+    ->label('sdk.description', '/docs/references/locale/list-countries.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_COUNTRY_LIST)
+    ->label('sdk.offline.model', '/locale/countries')
+    ->label('sdk.offline.response.key', 'code')
    ->inject('response')
    ->inject('locale')
    ->action(function (Response $response, Locale $locale) {
-        $list = array_keys(Config::getParam('locale-countries')); /* @var $list array */
+        $list = Config::getParam('locale-countries'); /* @var $list array */
        $output = [];

        foreach ($list as $value) {
@@ -142,19 +127,15 @@ App::get('/v1/locale/countries/eu')
    ->desc('List EU countries')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
-    ->label('sdk', new Method(
-        namespace: 'locale',
-        group: null,
-        name: 'listCountriesEU',
-        description: '/docs/references/locale/list-countries-eu.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_COUNTRY_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'locale')
+    ->label('sdk.method', 'listCountriesEU')
+    ->label('sdk.description', '/docs/references/locale/list-countries-eu.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_COUNTRY_LIST)
+    ->label('sdk.offline.model', '/locale/countries/eu')
+    ->label('sdk.offline.response.key', 'code')
    ->inject('response')
    ->inject('locale')
    ->action(function (Response $response, Locale $locale) {
@@ -181,19 +162,15 @@ App::get('/v1/locale/countries/phones')
    ->desc('List countries phone codes')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
-    ->label('sdk', new Method(
-        namespace: 'locale',
-        group: null,
-        name: 'listCountriesPhones',
-        description: '/docs/references/locale/list-countries-phones.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_PHONE_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'locale')
+    ->label('sdk.method', 'listCountriesPhones')
+    ->label('sdk.description', '/docs/references/locale/list-countries-phones.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_PHONE_LIST)
+    ->label('sdk.offline.model', '/locale/countries/phones')
+    ->label('sdk.offline.response.key', 'countryCode')
    ->inject('response')
    ->inject('locale')
    ->action(function (Response $response, Locale $locale) {
@@ -219,23 +196,19 @@ App::get('/v1/locale/continents')
    ->desc('List continents')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
-    ->label('sdk', new Method(
-        namespace: 'locale',
-        group: null,
-        name: 'listContinents',
-        description: '/docs/references/locale/list-continents.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_CONTINENT_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'locale')
+    ->label('sdk.method', 'listContinents')
+    ->label('sdk.description', '/docs/references/locale/list-continents.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_CONTINENT_LIST)
+    ->label('sdk.offline.model', '/locale/continents')
+    ->label('sdk.offline.response.key', 'code')
    ->inject('response')
    ->inject('locale')
    ->action(function (Response $response, Locale $locale) {
-        $list = array_keys(Config::getParam('locale-continents'));
+        $list = Config::getParam('locale-continents');

        foreach ($list as $value) {
            $output[] = new Document([
@@ -255,19 +228,15 @@ App::get('/v1/locale/currencies')
    ->desc('List currencies')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
-    ->label('sdk', new Method(
-        namespace: 'locale',
-        group: null,
-        name: 'listCurrencies',
-        description: '/docs/references/locale/list-currencies.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_CURRENCY_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'locale')
+    ->label('sdk.method', 'listCurrencies')
+    ->label('sdk.description', '/docs/references/locale/list-currencies.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_CURRENCY_LIST)
+    ->label('sdk.offline.model', '/locale/currencies')
+    ->label('sdk.offline.response.key', 'code')
    ->inject('response')
    ->action(function (Response $response) {
        $list = Config::getParam('locale-currencies');
@@ -282,19 +251,15 @@ App::get('/v1/locale/languages')
    ->desc('List languages')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
-    ->label('sdk', new Method(
-        namespace: 'locale',
-        group: null,
-        name: 'listLanguages',
-        description: '/docs/references/locale/list-languages.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_LANGUAGE_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'locale')
+    ->label('sdk.method', 'listLanguages')
+    ->label('sdk.description', '/docs/references/locale/list-languages.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_LANGUAGE_LIST)
+    ->label('sdk.offline.model', '/locale/languages')
+    ->label('sdk.offline.response.key', 'code')
    ->inject('response')
    ->action(function (Response $response) {
        $list = Config::getParam('locale-languages');
@@ -1,18 +1,18 @@
 <?php

+use Appwrite\Auth\OAuth2\Firebase as OAuth2Firebase;
 use Appwrite\Event\Event;
 use Appwrite\Event\Migration;
 use Appwrite\Extend\Exception;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Permission;
+use Appwrite\Role;
 use Appwrite\Utopia\Database\Validator\Queries\Migrations;
+use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Database\Database;
+use Utopia\Database\DateTime;
 use Utopia\Database\Document;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
@@ -22,7 +22,9 @@ use Utopia\Migration\Sources\Appwrite;
 use Utopia\Migration\Sources\Firebase;
 use Utopia\Migration\Sources\NHost;
 use Utopia\Migration\Sources\Supabase;
+use Utopia\System\System;
 use Utopia\Validator\ArrayList;
+use Utopia\Validator\Host;
 use Utopia\Validator\Integer;
 use Utopia\Validator\Text;
 use Utopia\Validator\URL;
@@ -32,27 +34,21 @@ include_once __DIR__ . '/../shared/api.php';

 App::post('/v1/migrations/appwrite')
    ->groups(['api', 'migrations'])
-    ->desc('Create Appwrite migration')
+    ->desc('Migrate Appwrite data')
    ->label('scope', 'migrations.write')
    ->label('event', 'migrations.[migrationId].create')
    ->label('audits.event', 'migration.create')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        group: null,
-        name: 'createAppwriteMigration',
-        description: '/docs/references/migrations/migration-appwrite.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_ACCEPTED,
-                model: Response::MODEL_MIGRATION,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'migrations')
+    ->label('sdk.method', 'createAppwriteMigration')
+    ->label('sdk.description', '/docs/references/migrations/migration-appwrite.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_ACCEPTED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MIGRATION)
    ->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')
@@ -91,26 +87,122 @@ App::post('/v1/migrations/appwrite')
            ->dynamic($migration, Response::MODEL_MIGRATION);
    });

-
-App::post('/v1/migrations/firebase')
+App::post('/v1/migrations/firebase/oauth')
    ->groups(['api', 'migrations'])
-    ->desc('Create Firebase migration')
+    ->desc('Migrate Firebase data (OAuth)')
    ->label('scope', 'migrations.write')
    ->label('event', 'migrations.[migrationId].create')
    ->label('audits.event', 'migration.create')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        group: null,
-        name: 'createFirebaseMigration',
-        description: '/docs/references/migrations/migration-firebase.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_ACCEPTED,
-                model: Response::MODEL_MIGRATION,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'migrations')
+    ->label('sdk.method', 'createFirebaseOAuthMigration')
+    ->label('sdk.description', '/docs/references/migrations/migration-firebase.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_ACCEPTED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MIGRATION)
+    ->param('resources', [], new ArrayList(new WhiteList(Firebase::getSupportedResources())), 'List of resources to migrate')
+    ->param('projectId', '', new Text(65536), 'Project ID of the Firebase Project')
+    ->inject('response')
+    ->inject('dbForProject')
+    ->inject('dbForConsole')
+    ->inject('project')
+    ->inject('user')
+    ->inject('queueForEvents')
+    ->inject('queueForMigrations')
+    ->inject('request')
+    ->action(function (array $resources, string $projectId, Response $response, Database $dbForProject, Database $dbForConsole, Document $project, Document $user, Event $queueForEvents, Migration $queueForMigrations, Request $request) {
+        $firebase = new OAuth2Firebase(
+            System::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_ID', ''),
+            System::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET', ''),
+            $request->getProtocol() . '://' . $request->getHostname() . '/v1/migrations/firebase/redirect'
+        );
+
+        $identity = $dbForConsole->findOne('identities', [
+            Query::equal('provider', ['firebase']),
+            Query::equal('userInternalId', [$user->getInternalId()]),
+        ]);
+        if ($identity->isEmpty()) {
+            throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
+        }
+
+        $accessToken = $identity->getAttribute('providerAccessToken');
+        $refreshToken = $identity->getAttribute('providerRefreshToken');
+        $accessTokenExpiry = $identity->getAttribute('providerAccessTokenExpiry');
+
+        $isExpired = new \DateTime($accessTokenExpiry) < new \DateTime('now');
+        if ($isExpired) {
+            $firebase->refreshTokens($refreshToken);
+
+            $accessToken = $firebase->getAccessToken('');
+            $refreshToken = $firebase->getRefreshToken('');
+
+            $verificationId = $firebase->getUserID($accessToken);
+
+            if (empty($verificationId)) {
+                throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED, 'Another request is currently refreshing OAuth token. Please try again.');
+            }
+
+            $identity = $identity
+                ->setAttribute('providerAccessToken', $accessToken)
+                ->setAttribute('providerRefreshToken', $refreshToken)
+                ->setAttribute('providerAccessTokenExpiry', DateTime::addSeconds(new \DateTime(), (int)$firebase->getAccessTokenExpiry('')));
+
+            $dbForConsole->updateDocument('identities', $identity->getId(), $identity);
+        }
+
+        if ($identity->getAttribute('secrets')) {
+            $serviceAccount = $identity->getAttribute('secrets');
+        } else {
+            $firebase->cleanupServiceAccounts($accessToken, $projectId);
+            $serviceAccount = $firebase->createServiceAccount($accessToken, $projectId);
+            $identity = $identity
+                ->setAttribute('secrets', json_encode($serviceAccount));
+
+            $dbForConsole->updateDocument('identities', $identity->getId(), $identity);
+        }
+
+        $migration = $dbForProject->createDocument('migrations', new Document([
+            '$id' => ID::unique(),
+            'status' => 'pending',
+            'stage' => 'init',
+            'source' => Firebase::getName(),
+            'destination' => Appwrite::getName(),
+            'credentials' => [
+                'serviceAccount' => json_encode($serviceAccount),
+            ],
+            'resources' => $resources,
+            'statusCounters' => '{}',
+            'resourceData' => '{}',
+            'errors' => []
+        ]));
+
+        $queueForEvents->setParam('migrationId', $migration->getId());
+
+        // Trigger Transfer
+        $queueForMigrations
+            ->setMigration($migration)
+            ->setProject($project)
+            ->setUser($user)
+            ->trigger();
+
+        $response
+            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
+            ->dynamic($migration, Response::MODEL_MIGRATION);
+    });
+
+App::post('/v1/migrations/firebase')
+    ->groups(['api', 'migrations'])
+    ->desc('Migrate Firebase data (Service Account)')
+    ->label('scope', 'migrations.write')
+    ->label('event', 'migrations.[migrationId].create')
+    ->label('audits.event', 'migration.create')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'migrations')
+    ->label('sdk.method', 'createFirebaseMigration')
+    ->label('sdk.description', '/docs/references/migrations/migration-firebase.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_ACCEPTED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MIGRATION)
    ->param('resources', [], new ArrayList(new WhiteList(Firebase::getSupportedResources())), 'List of resources to migrate')
    ->param('serviceAccount', '', new Text(65536), 'JSON of the Firebase service account credentials')
    ->inject('response')
@@ -161,23 +253,17 @@ App::post('/v1/migrations/firebase')

 App::post('/v1/migrations/supabase')
    ->groups(['api', 'migrations'])
-    ->desc('Create Supabase migration')
+    ->desc('Migrate Supabase data')
    ->label('scope', 'migrations.write')
    ->label('event', 'migrations.[migrationId].create')
    ->label('audits.event', 'migration.create')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        group: null,
-        name: 'createSupabaseMigration',
-        description: '/docs/references/migrations/migration-supabase.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_ACCEPTED,
-                model: Response::MODEL_MIGRATION,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'migrations')
+    ->label('sdk.method', 'createSupabaseMigration')
+    ->label('sdk.description', '/docs/references/migrations/migration-supabase.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_ACCEPTED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MIGRATION)
    ->param('resources', [], new ArrayList(new WhiteList(Supabase::getSupportedResources(), true)), 'List of resources to migrate')
    ->param('endpoint', '', new URL(), 'Source\'s Supabase Endpoint')
    ->param('apiKey', '', new Text(512), 'Source\'s API Key')
@@ -228,23 +314,17 @@ App::post('/v1/migrations/supabase')

 App::post('/v1/migrations/nhost')
    ->groups(['api', 'migrations'])
-    ->desc('Create NHost migration')
+    ->desc('Migrate NHost data')
    ->label('scope', 'migrations.write')
    ->label('event', 'migrations.[migrationId].create')
    ->label('audits.event', 'migration.create')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        group: null,
-        name: 'createNHostMigration',
-        description: '/docs/references/migrations/migration-nhost.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_ACCEPTED,
-                model: Response::MODEL_MIGRATION,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'migrations')
+    ->label('sdk.method', 'createNHostMigration')
+    ->label('sdk.description', '/docs/references/migrations/migration-nhost.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_ACCEPTED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MIGRATION)
    ->param('resources', [], new ArrayList(new WhiteList(NHost::getSupportedResources())), 'List of resources to migrate')
    ->param('subdomain', '', new Text(512), 'Source\'s Subdomain')
    ->param('region', '', new Text(512), 'Source\'s Region')
@@ -299,19 +379,13 @@ App::get('/v1/migrations')
    ->groups(['api', 'migrations'])
    ->desc('List migrations')
    ->label('scope', 'migrations.read')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        group: null,
-        name: 'list',
-        description: '/docs/references/migrations/list-migrations.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_MIGRATION_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'migrations')
+    ->label('sdk.method', 'list')
+    ->label('sdk.description', '/docs/references/migrations/list-migrations.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MIGRATION_LIST)
    ->param('queries', [], new Migrations(), '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. You may filter on the following attributes: ' . implode(', ', Migrations::ALLOWED_ATTRIBUTES), true)
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('response')
@@ -353,15 +427,10 @@ App::get('/v1/migrations')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $migrations = $dbForProject->find('migrations', $queries);
-            $total = $dbForProject->count('migrations', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
        $response->dynamic(new Document([
-            'migrations' => $migrations,
-            'total' => $total,
+            'migrations' => $dbForProject->find('migrations', $queries),
+            'total' => $dbForProject->count('migrations', $filterQueries, APP_LIMIT_COUNT),
        ]), Response::MODEL_MIGRATION_LIST);
    });

@@ -369,19 +438,13 @@ App::get('/v1/migrations/:migrationId')
    ->groups(['api', 'migrations'])
    ->desc('Get migration')
    ->label('scope', 'migrations.read')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        group: null,
-        name: 'get',
-        description: '/docs/references/migrations/get-migration.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_MIGRATION,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'migrations')
+    ->label('sdk.method', 'get')
+    ->label('sdk.description', '/docs/references/migrations/get-migration.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MIGRATION)
    ->param('migrationId', '', new UID(), 'Migration unique ID.')
    ->inject('response')
    ->inject('dbForProject')
@@ -397,21 +460,15 @@ App::get('/v1/migrations/:migrationId')

 App::get('/v1/migrations/appwrite/report')
    ->groups(['api', 'migrations'])
-    ->desc('Get Appwrite migration report')
+    ->desc('Generate a report on Appwrite data')
    ->label('scope', 'migrations.write')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        group: null,
-        name: 'getAppwriteReport',
-        description: '/docs/references/migrations/migration-appwrite-report.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_MIGRATION_REPORT,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'migrations')
+    ->label('sdk.method', 'getAppwriteReport')
+    ->label('sdk.description', '/docs/references/migrations/migration-appwrite-report.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MIGRATION_REPORT)
    ->param('resources', [], new ArrayList(new WhiteList(Appwrite::getSupportedResources())), 'List of resources to migrate')
    ->param('endpoint', '', new URL(), "Source's Appwrite Endpoint")
    ->param('projectID', '', new Text(512), "Source's Project ID")
@@ -421,7 +478,6 @@ App::get('/v1/migrations/appwrite/report')
    ->inject('project')
    ->inject('user')
    ->action(function (array $resources, string $endpoint, string $projectID, string $key, Response $response) {
-
        $appwrite = new Appwrite($projectID, $endpoint, $key);

        try {
@@ -446,21 +502,15 @@ App::get('/v1/migrations/appwrite/report')

 App::get('/v1/migrations/firebase/report')
    ->groups(['api', 'migrations'])
-    ->desc('Get Firebase migration report')
+    ->desc('Generate a report on Firebase data')
    ->label('scope', 'migrations.write')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        group: null,
-        name: 'getFirebaseReport',
-        description: '/docs/references/migrations/migration-firebase-report.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_MIGRATION_REPORT,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'migrations')
+    ->label('sdk.method', 'getFirebaseReport')
+    ->label('sdk.description', '/docs/references/migrations/migration-firebase-report.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MIGRATION_REPORT)
    ->param('resources', [], new ArrayList(new WhiteList(Firebase::getSupportedResources())), 'List of resources to migrate')
    ->param('serviceAccount', '', new Text(65536), 'JSON of the Firebase service account credentials')
    ->inject('response')
@@ -497,23 +547,379 @@ App::get('/v1/migrations/firebase/report')
            ->dynamic(new Document($report), Response::MODEL_MIGRATION_REPORT);
    });

+App::get('/v1/migrations/firebase/report/oauth')
+    ->groups(['api', 'migrations'])
+    ->desc('Generate a report on Firebase data using OAuth')
+    ->label('scope', 'migrations.write')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'migrations')
+    ->label('sdk.method', 'getFirebaseReportOAuth')
+    ->label('sdk.description', '/docs/references/migrations/migration-firebase-report.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MIGRATION_REPORT)
+    ->param('resources', [], new ArrayList(new WhiteList(Firebase::getSupportedResources())), 'List of resources to migrate')
+    ->param('projectId', '', new Text(65536), 'Project ID')
+    ->inject('response')
+    ->inject('request')
+    ->inject('user')
+    ->inject('dbForConsole')
+    ->action(function (array $resources, string $projectId, Response $response, Request $request, Document $user, Database $dbForConsole) {
+        $firebase = new OAuth2Firebase(
+            System::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_ID', ''),
+            System::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET', ''),
+            $request->getProtocol() . '://' . $request->getHostname() . '/v1/migrations/firebase/redirect'
+        );
+
+        $identity = $dbForConsole->findOne('identities', [
+            Query::equal('provider', ['firebase']),
+            Query::equal('userInternalId', [$user->getInternalId()]),
+        ]);
+
+        if ($identity->isEmpty()) {
+            throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
+        }
+
+        $accessToken = $identity->getAttribute('providerAccessToken');
+        $refreshToken = $identity->getAttribute('providerRefreshToken');
+        $accessTokenExpiry = $identity->getAttribute('providerAccessTokenExpiry');
+
+        if (empty($accessToken) || empty($refreshToken) || empty($accessTokenExpiry)) {
+            throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
+        }
+
+        if (System::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_ID', '') === '' || System::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET', '') === '') {
+            throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
+        }
+
+        $isExpired = new \DateTime($accessTokenExpiry) < new \DateTime('now');
+        if ($isExpired) {
+            $firebase->refreshTokens($refreshToken);
+
+            $accessToken = $firebase->getAccessToken('');
+            $refreshToken = $firebase->getRefreshToken('');
+
+            $verificationId = $firebase->getUserID($accessToken);
+
+            if (empty($verificationId)) {
+                throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED, 'Another request is currently refreshing OAuth token. Please try again.');
+            }
+
+            $identity = $identity
+                ->setAttribute('providerAccessToken', $accessToken)
+                ->setAttribute('providerRefreshToken', $refreshToken)
+                ->setAttribute('providerAccessTokenExpiry', DateTime::addSeconds(new \DateTime(), (int)$firebase->getAccessTokenExpiry('')));
+
+            $dbForConsole->updateDocument('identities', $identity->getId(), $identity);
+        }
+
+        // Get Service Account
+        if ($identity->getAttribute('secrets')) {
+            $serviceAccount = $identity->getAttribute('secrets');
+        } else {
+            $firebase->cleanupServiceAccounts($accessToken, $projectId);
+            $serviceAccount = $firebase->createServiceAccount($accessToken, $projectId);
+            $identity = $identity
+                ->setAttribute('secrets', json_encode($serviceAccount));
+
+            $dbForConsole->updateDocument('identities', $identity->getId(), $identity);
+        }
+
+        $firebase = new Firebase($serviceAccount);
+
+        try {
+            $report = $firebase->report($resources);
+        } catch (\Throwable $e) {
+            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Source Error: ' . $e->getMessage());
+        }
+
+        $response
+            ->setStatusCode(Response::STATUS_CODE_OK)
+            ->dynamic(new Document($report), Response::MODEL_MIGRATION_REPORT);
+    });
+
+App::get('/v1/migrations/firebase/connect')
+    ->desc('Authorize with Firebase')
+    ->groups(['api', 'migrations'])
+    ->label('scope', 'migrations.write')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'migrations')
+    ->label('sdk.method', 'createFirebaseAuth')
+    ->label('sdk.description', '')
+    ->label('sdk.response.code', Response::STATUS_CODE_MOVED_PERMANENTLY)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_HTML)
+    ->label('sdk.methodType', 'webAuth')
+    ->label('sdk.hide', true)
+    ->param('redirect', '', fn ($clients) => new Host($clients), 'URL to redirect back to your Firebase authorization. Only console hostnames are allowed.', true, ['clients'])
+    ->param('projectId', '', new UID(), 'Project ID')
+    ->inject('response')
+    ->inject('request')
+    ->inject('user')
+    ->inject('dbForConsole')
+    ->action(function (string $redirect, string $projectId, Response $response, Request $request, Document $user, Database $dbForConsole) {
+        $state = \json_encode([
+            'projectId' => $projectId,
+            'redirect' => $redirect,
+        ]);
+
+        $prefs = $user->getAttribute('prefs', []);
+        $prefs['migrationState'] = $state;
+        $user->setAttribute('prefs', $prefs);
+        $dbForConsole->updateDocument('users', $user->getId(), $user);
+
+        $oauth2 = new OAuth2Firebase(
+            System::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_ID', ''),
+            System::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET', ''),
+            $request->getProtocol() . '://' . $request->getHostname() . '/v1/migrations/firebase/redirect'
+        );
+        $url = $oauth2->getLoginURL();
+
+        $response
+            ->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
+            ->addHeader('Pragma', 'no-cache')
+            ->redirect($url);
+    });
+
+App::get('/v1/migrations/firebase/redirect')
+    ->desc('Capture and receive data on Firebase authorization')
+    ->groups(['api', 'migrations'])
+    ->label('scope', 'public')
+    ->label('error', __DIR__ . '/../../views/general/error.phtml')
+    ->param('code', '', new Text(2048), 'OAuth2 code. This is a temporary code that the will be later exchanged for an access token.', true)
+    ->inject('user')
+    ->inject('project')
+    ->inject('request')
+    ->inject('response')
+    ->inject('dbForConsole')
+    ->action(function (string $code, Document $user, Document $project, Request $request, Response $response, Database $dbForConsole) {
+        $state = $user['prefs']['migrationState'] ?? '{}';
+        $prefs['migrationState'] = '';
+        $user->setAttribute('prefs', $prefs);
+        $dbForConsole->updateDocument('users', $user->getId(), $user);
+
+        if (empty($state)) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Installation requests from organisation members for the Appwrite Google App are currently unsupported.');
+        }
+
+        $state = \json_decode($state, true);
+        $redirect = $state['redirect'] ?? '';
+        $projectId = $state['projectId'] ?? '';
+
+        $project = $dbForConsole->getDocument('projects', $projectId);
+
+        if (empty($redirect)) {
+            $redirect = $request->getProtocol() . '://' . $request->getHostname() . '/console/project-$projectId/settings/migrations';
+        }
+
+        if ($project->isEmpty()) {
+            $response
+                ->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
+                ->addHeader('Pragma', 'no-cache')
+                ->redirect($redirect);
+
+            return;
+        }
+
+        // OAuth Authroization
+        if (!empty($code)) {
+            $oauth2 = new OAuth2Firebase(
+                System::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_ID', ''),
+                System::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET', ''),
+                $request->getProtocol() . '://' . $request->getHostname() . '/v1/migrations/firebase/redirect'
+            );
+
+            $accessToken = $oauth2->getAccessToken($code);
+            $refreshToken = $oauth2->getRefreshToken($code);
+            $accessTokenExpiry = $oauth2->getAccessTokenExpiry($code);
+            $email = $oauth2->getUserEmail($accessToken);
+            $oauth2ID = $oauth2->getUserID($accessToken);
+
+            if (empty($accessToken)) {
+                throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to get access token.');
+            }
+
+            if (empty($refreshToken)) {
+                throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to get refresh token.');
+            }
+
+            if (empty($accessTokenExpiry)) {
+                throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to get access token expiry.');
+            }
+
+            // Makes sure this email is not already used in another identity
+            $identity = $dbForConsole->findOne('identities', [
+                Query::equal('providerEmail', [$email]),
+            ]);
+
+            if (!$identity->isEmpty()) {
+                if ($identity->getAttribute('userInternalId', '') !== $user->getInternalId()) {
+                    throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
+                }
+            }
+
+            if (!$identity->isEmpty()) {
+                $identity = $identity
+                    ->setAttribute('providerAccessToken', $accessToken)
+                    ->setAttribute('providerRefreshToken', $refreshToken)
+                    ->setAttribute('providerAccessTokenExpiry', DateTime::addSeconds(new \DateTime(), (int)$accessTokenExpiry));
+
+                $dbForConsole->updateDocument('identities', $identity->getId(), $identity);
+            } else {
+                $identity = $dbForConsole->createDocument('identities', new Document([
+                    '$id' => ID::unique(),
+                    '$permissions' => [
+                        Permission::read(Role::any()),
+                        Permission::update(Role::user($user->getId())),
+                        Permission::delete(Role::user($user->getId())),
+                    ],
+                    'userInternalId' => $user->getInternalId(),
+                    'userId' => $user->getId(),
+                    'provider' => 'firebase',
+                    'providerUid' => $oauth2ID,
+                    'providerEmail' => $email,
+                    'providerAccessToken' => $accessToken,
+                    'providerRefreshToken' => $refreshToken,
+                    'providerAccessTokenExpiry' => DateTime::addSeconds(new \DateTime(), (int)$accessTokenExpiry),
+                ]));
+            }
+        } else {
+            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Missing OAuth2 code.');
+        }
+
+        $response
+            ->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
+            ->addHeader('Pragma', 'no-cache')
+            ->redirect($redirect);
+    });
+
+App::get('/v1/migrations/firebase/projects')
+    ->desc('List Firebase projects')
+    ->groups(['api', 'migrations'])
+    ->label('scope', 'migrations.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'migrations')
+    ->label('sdk.method', 'listFirebaseProjects')
+    ->label('sdk.description', '')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MIGRATION_FIREBASE_PROJECT_LIST)
+    ->inject('user')
+    ->inject('response')
+    ->inject('project')
+    ->inject('dbForConsole')
+    ->inject('request')
+    ->action(function (Document $user, Response $response, Document $project, Database $dbForConsole, Request $request) {
+        $firebase = new OAuth2Firebase(
+            System::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_ID', ''),
+            System::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET', ''),
+            $request->getProtocol() . '://' . $request->getHostname() . '/v1/migrations/firebase/redirect'
+        );
+
+        $identity = $dbForConsole->findOne('identities', [
+            Query::equal('provider', ['firebase']),
+            Query::equal('userInternalId', [$user->getInternalId()]),
+        ]);
+
+        if ($identity->isEmpty()) {
+            throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
+        }
+
+        $accessToken = $identity->getAttribute('providerAccessToken');
+        $refreshToken = $identity->getAttribute('providerRefreshToken');
+        $accessTokenExpiry = $identity->getAttribute('providerAccessTokenExpiry');
+
+        if (empty($accessToken) || empty($refreshToken) || empty($accessTokenExpiry)) {
+            throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
+        }
+
+        if (System::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_ID', '') === '' || System::getEnv('_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET', '') === '') {
+            throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
+        }
+
+        try {
+            $isExpired = new \DateTime($accessTokenExpiry) < new \DateTime('now');
+            if ($isExpired) {
+                try {
+                    $firebase->refreshTokens($refreshToken);
+                } catch (\Throwable $e) {
+                    throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
+                }
+
+                $accessToken = $firebase->getAccessToken('');
+                $refreshToken = $firebase->getRefreshToken('');
+
+                $verificationId = $firebase->getUserID($accessToken);
+
+                if (empty($verificationId)) {
+                    throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED, 'Another request is currently refreshing OAuth token. Please try again.');
+                }
+
+                $identity = $identity
+                    ->setAttribute('providerAccessToken', $accessToken)
+                    ->setAttribute('providerRefreshToken', $refreshToken)
+                    ->setAttribute('providerAccessTokenExpiry', DateTime::addSeconds(new \DateTime(), (int)$firebase->getAccessTokenExpiry('')));
+
+                $dbForConsole->updateDocument('identities', $identity->getId(), $identity);
+            }
+
+            $projects = $firebase->getProjects($accessToken);
+
+            $output = [];
+            foreach ($projects as $project) {
+                $output[] = [
+                    'displayName' => $project['displayName'],
+                    'projectId' => $project['projectId'],
+                ];
+            }
+        } catch (\Throwable $e) {
+            throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
+        }
+
+        $response->dynamic(new Document([
+            'projects' => $output,
+            'total' => count($output),
+        ]), Response::MODEL_MIGRATION_FIREBASE_PROJECT_LIST);
+    });
+
+App::get('/v1/migrations/firebase/deauthorize')
+    ->desc('Revoke Appwrite\'s authorization to access Firebase projects')
+    ->groups(['api', 'migrations'])
+    ->label('scope', 'migrations.write')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'migrations')
+    ->label('sdk.method', 'deleteFirebaseAuth')
+    ->label('sdk.description', '')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->inject('user')
+    ->inject('response')
+    ->inject('dbForConsole')
+    ->action(function (Document $user, Response $response, Database $dbForConsole) {
+        $identity = $dbForConsole->findOne('identities', [
+            Query::equal('provider', ['firebase']),
+            Query::equal('userInternalId', [$user->getInternalId()]),
+        ]);
+
+        if ($identity->isEmpty()) {
+            throw new Exception(Exception::GENERAL_ACCESS_FORBIDDEN, 'Not authenticated with Firebase'); //TODO: Replace with USER_IDENTITY_NOT_FOUND
+        }
+
+        $dbForConsole->deleteDocument('identities', $identity->getId());
+
+        $response->noContent();
+    });
+
 App::get('/v1/migrations/supabase/report')
    ->groups(['api', 'migrations'])
-    ->desc('Get Supabase migration report')
+    ->desc('Generate a report on Supabase Data')
    ->label('scope', 'migrations.write')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        group: null,
-        name: 'getSupabaseReport',
-        description: '/docs/references/migrations/migration-supabase-report.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_MIGRATION_REPORT,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'migrations')
+    ->label('sdk.method', 'getSupabaseReport')
+    ->label('sdk.description', '/docs/references/migrations/migration-supabase-report.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MIGRATION_REPORT)
    ->param('resources', [], new ArrayList(new WhiteList(Supabase::getSupportedResources(), true)), 'List of resources to migrate')
    ->param('endpoint', '', new URL(), 'Source\'s Supabase Endpoint.')
    ->param('apiKey', '', new Text(512), 'Source\'s API Key.')
@@ -548,21 +954,15 @@ App::get('/v1/migrations/supabase/report')

 App::get('/v1/migrations/nhost/report')
    ->groups(['api', 'migrations'])
-    ->desc('Get NHost migration report')
+    ->desc('Generate a report on NHost Data')
    ->label('scope', 'migrations.write')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        group: null,
-        name: 'getNHostReport',
-        description: '/docs/references/migrations/migration-nhost-report.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_MIGRATION_REPORT,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'migrations')
+    ->label('sdk.method', 'getNHostReport')
+    ->label('sdk.description', '/docs/references/migrations/migration-nhost-report.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MIGRATION_REPORT)
    ->param('resources', [], new ArrayList(new WhiteList(NHost::getSupportedResources())), 'List of resources to migrate.')
    ->param('subdomain', '', new Text(512), 'Source\'s Subdomain.')
    ->param('region', '', new Text(512), 'Source\'s Region.')
@@ -597,24 +997,18 @@ App::get('/v1/migrations/nhost/report')

 App::patch('/v1/migrations/:migrationId')
    ->groups(['api', 'migrations'])
-    ->desc('Update retry migration')
+    ->desc('Retry migration')
    ->label('scope', 'migrations.write')
    ->label('event', 'migrations.[migrationId].retry')
    ->label('audits.event', 'migration.retry')
    ->label('audits.resource', 'migrations/{request.migrationId}')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        group: null,
-        name: 'retry',
-        description: '/docs/references/migrations/retry-migration.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_ACCEPTED,
-                model: Response::MODEL_MIGRATION,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'migrations')
+    ->label('sdk.method', 'retry')
+    ->label('sdk.description', '/docs/references/migrations/retry-migration.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_ACCEPTED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MIGRATION)
    ->param('migrationId', '', new UID(), 'Migration unique ID.')
    ->inject('response')
    ->inject('dbForProject')
@@ -653,20 +1047,12 @@ App::delete('/v1/migrations/:migrationId')
    ->label('event', 'migrations.[migrationId].delete')
    ->label('audits.event', 'migrationId.delete')
    ->label('audits.resource', 'migrations/{request.migrationId}')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        group: null,
-        name: 'delete',
-        description: '/docs/references/migrations/delete-migration.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_NOCONTENT,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        contentType: ContentType::NONE
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'migrations')
+    ->label('sdk.method', 'delete')
+    ->label('sdk.description', '/docs/references/migrations/delete-migration.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
+    ->label('sdk.response.model', Response::MODEL_NONE)
    ->param('migrationId', '', new UID(), 'Migration ID.')
    ->inject('response')
    ->inject('dbForProject')
@@ -1,10 +1,6 @@
 <?php

 use Appwrite\Extend\Exception;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Database\Database;
@@ -17,6 +13,7 @@ use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Datetime as DateTimeValidator;
 use Utopia\Database\Validator\UID;
+use Utopia\Validator\Boolean;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;

@@ -24,35 +21,23 @@ App::get('/v1/project/usage')
    ->desc('Get project usage stats')
    ->groups(['api', 'usage'])
    ->label('scope', 'projects.read')
-    ->label('sdk', new Method(
-        namespace: 'project',
-        group: null,
-        name: 'getUsage',
-        description: '/docs/references/project/get-usage.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_USAGE_PROJECT,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'project')
+    ->label('sdk.method', 'getUsage')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_USAGE_PROJECT)
    ->param('startDate', '', new DateTimeValidator(), 'Starting date for the 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) {
        $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,
@@ -65,10 +50,7 @@ App::get('/v1/project/usage')
                METRIC_FILES_STORAGE,
                METRIC_DATABASES_STORAGE,
                METRIC_DEPLOYMENTS_STORAGE,
-                METRIC_BUILDS_STORAGE,
-                METRIC_DATABASES_OPERATIONS_READS,
-                METRIC_DATABASES_OPERATIONS_WRITES,
-                METRIC_FILES_IMAGES_TRANSFORMED,
+                METRIC_BUILDS_STORAGE
            ],
            'period' => [
                METRIC_NETWORK_REQUESTS,
@@ -78,10 +60,7 @@ App::get('/v1/project/usage')
                METRIC_EXECUTIONS,
                METRIC_DATABASES_STORAGE,
                METRIC_EXECUTIONS_MB_SECONDS,
-                METRIC_BUILDS_MB_SECONDS,
-                METRIC_DATABASES_OPERATIONS_READS,
-                METRIC_DATABASES_OPERATIONS_WRITES,
-                METRIC_FILES_IMAGES_TRANSFORMED,
+                METRIC_BUILDS_MB_SECONDS
            ]
        ];

@@ -100,11 +79,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 +89,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),
@@ -283,46 +258,6 @@ App::get('/v1/project/usage')
            ];
        }, $dbForProject->find('functions'));

-        // This total is includes free and paid SMS usage
-        $authPhoneTotal = Authorization::skip(fn () => $dbForProject->sum('stats', 'value', [
-            Query::equal('metric', [METRIC_AUTH_METHOD_PHONE]),
-            Query::equal('period', ['1d']),
-            Query::greaterThanEqual('time', $firstDay),
-            Query::lessThan('time', $lastDay),
-        ]));
-
-        // This estimate is only for paid SMS usage
-        $authPhoneMetrics = Authorization::skip(fn () => $dbForProject->find('stats', [
-            Query::startsWith('metric', METRIC_AUTH_METHOD_PHONE . '.'),
-            Query::equal('period', ['1d']),
-            Query::greaterThanEqual('time', $firstDay),
-            Query::lessThan('time', $lastDay),
-        ]));
-
-        $authPhoneEstimate = 0.0;
-        $authPhoneCountryBreakdown = [];
-        foreach ($authPhoneMetrics as $metric) {
-            $parts = explode('.', $metric->getAttribute('metric'));
-            $countryCode = $parts[3] ?? null;
-            if ($countryCode === null) {
-                continue;
-            }
-
-            $value = $metric->getAttribute('value', 0);
-
-            if (isset($smsRates[$countryCode])) {
-                $authPhoneEstimate += $value * $smsRates[$countryCode];
-            }
-
-            $authPhoneCountryBreakdown[] = [
-                'name' => $countryCode,
-                'value' => $value,
-                'estimate' => isset($smsRates[$countryCode])
-                    ? $value * $smsRates[$countryCode]
-                    : 0.0,
-            ];
-        }
-
        // merge network inbound + outbound
        $projectBandwidth = [];
        foreach ($usage[METRIC_NETWORK_INBOUND] as $item) {
@@ -361,21 +296,14 @@ App::get('/v1/project/usage')
            'functionsStorageTotal' => $total[METRIC_DEPLOYMENTS_STORAGE] + $total[METRIC_BUILDS_STORAGE],
            'buildsStorageTotal' => $total[METRIC_BUILDS_STORAGE],
            'deploymentsStorageTotal' => $total[METRIC_DEPLOYMENTS_STORAGE],
-            'databasesReadsTotal' => $total[METRIC_DATABASES_OPERATIONS_READS],
-            'databasesWritesTotal' => $total[METRIC_DATABASES_OPERATIONS_WRITES],
            'executionsBreakdown' => $executionsBreakdown,
+            'executionsMbSecondsBreakdown' => $executionsMbSecondsBreakdown,
+            'buildsMbSecondsBreakdown' => $buildsMbSecondsBreakdown,
            'bucketsBreakdown' => $bucketsBreakdown,
-            'databasesReads' => $usage[METRIC_DATABASES_OPERATIONS_READS],
-            'databasesWrites' => $usage[METRIC_DATABASES_OPERATIONS_WRITES],
            'databasesStorageBreakdown' => $databasesStorageBreakdown,
            'executionsMbSecondsBreakdown' => $executionsMbSecondsBreakdown,
            'buildsMbSecondsBreakdown' => $buildsMbSecondsBreakdown,
            'functionsStorageBreakdown' => $functionsStorageBreakdown,
-            'authPhoneTotal' => $authPhoneTotal,
-            'authPhoneEstimate' => $authPhoneEstimate,
-            'authPhoneCountryBreakdown' => $authPhoneCountryBreakdown,
-            'imageTransformations' => $usage[METRIC_FILES_IMAGES_TRANSFORMED],
-            'imageTransformationsTotal' => $total[METRIC_FILES_IMAGES_TRANSFORMED],
        ]), Response::MODEL_USAGE_PROJECT);
    });

@@ -386,26 +314,21 @@ App::post('/v1/project/variables')
    ->groups(['api'])
    ->label('scope', 'projects.write')
    ->label('audits.event', 'variable.create')
-    ->label('sdk', new Method(
-        namespace: 'project',
-        group: null,
-        name: 'createVariable',
-        description: '/docs/references/project/create-variable.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_CREATED,
-                model: Response::MODEL_VARIABLE,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'project')
+    ->label('sdk.method', 'createVariable')
+    ->label('sdk.description', '/docs/references/project/create-variable.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_VARIABLE)
    ->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', false, new Boolean(), 'Is secret? Secret variables can only be updated or deleted, they cannot be read.', true)
    ->inject('project')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('dbForPlatform')
-    ->action(function (string $key, string $value, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
+    ->inject('dbForConsole')
+    ->action(function (string $key, string $value, bool $secret, Document $project, Response $response, Database $dbForProject, Database $dbForConsole) {
        $variableId = ID::unique();

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

@@ -446,19 +370,13 @@ App::get('/v1/project/variables')
    ->desc('List variables')
    ->groups(['api'])
    ->label('scope', 'projects.read')
-    ->label('sdk', new Method(
-        namespace: 'project',
-        group: null,
-        name: 'listVariables',
-        description: '/docs/references/project/list-variables.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_VARIABLE_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'project')
+    ->label('sdk.method', 'listVariables')
+    ->label('sdk.description', '/docs/references/project/list-variables.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_VARIABLE_LIST)
    ->inject('response')
    ->inject('dbForProject')
    ->action(function (Response $response, Database $dbForProject) {
@@ -477,19 +395,13 @@ App::get('/v1/project/variables/:variableId')
    ->desc('Get variable')
    ->groups(['api'])
    ->label('scope', 'projects.read')
-    ->label('sdk', new Method(
-        namespace: 'project',
-        group: null,
-        name: 'getVariable',
-        description: '/docs/references/project/get-variable.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_VARIABLE,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'project')
+    ->label('sdk.method', 'getVariable')
+    ->label('sdk.description', '/docs/references/project/get-variable.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_VARIABLE)
    ->param('variableId', '', new UID(), 'Variable unique ID.', false)
    ->inject('response')
    ->inject('project')
@@ -507,27 +419,21 @@ App::put('/v1/project/variables/:variableId')
    ->desc('Update variable')
    ->groups(['api'])
    ->label('scope', 'projects.write')
-    ->label('sdk', new Method(
-        namespace: 'project',
-        group: null,
-        name: 'updateVariable',
-        description: '/docs/references/project/update-variable.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_VARIABLE,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'project')
+    ->label('sdk.method', 'updateVariable')
+    ->label('sdk.description', '/docs/references/project/update-variable.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_VARIABLE)
    ->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)
    ->inject('project')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('dbForPlatform')
-    ->action(function (string $variableId, string $key, ?string $value, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
+    ->inject('dbForConsole')
+    ->action(function (string $variableId, string $key, ?string $value, Document $project, Response $response, Database $dbForProject, Database $dbForConsole) {
        $variable = $dbForProject->getDocument('variables', $variableId);
        if ($variable === false || $variable->isEmpty() || $variable->getAttribute('resourceType') !== 'project') {
            throw new Exception(Exception::VARIABLE_NOT_FOUND);
@@ -559,20 +465,12 @@ App::delete('/v1/project/variables/:variableId')
    ->desc('Delete variable')
    ->groups(['api'])
    ->label('scope', 'projects.write')
-    ->label('sdk', new Method(
-        namespace: 'project',
-        group: null,
-        name: 'deleteVariable',
-        description: '/docs/references/project/delete-variable.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_NOCONTENT,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        contentType: ContentType::NONE
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'project')
+    ->label('sdk.method', 'deleteVariable')
+    ->label('sdk.description', '/docs/references/project/delete-variable.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
+    ->label('sdk.response.model', Response::MODEL_NONE)
    ->param('variableId', '', new UID(), 'Variable unique ID.', false)
    ->inject('project')
    ->inject('response')
@@ -5,17 +5,12 @@ use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Extend\Exception;
 use Appwrite\Network\Validator\CNAME;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Database\Validator\Queries\Rules;
 use Appwrite\Utopia\Response;
 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;
@@ -33,63 +28,45 @@ App::post('/v1/proxy/rules')
    ->label('event', 'rules.[ruleId].create')
    ->label('audits.event', 'rule.create')
    ->label('audits.resource', 'rule/{response.$id}')
-    ->label('sdk', new Method(
-        namespace: 'proxy',
-        group: null,
-        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,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'proxy')
+    ->label('sdk.method', 'createRule')
+    ->label('sdk.description', '/docs/references/proxy/create-rule.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.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('resourceType', null, new WhiteList(['api', 'function', 'site']), 'Action definition for the rule. Possible values are "api", "function" and "site"')
    ->param('resourceId', '', new UID(), 'ID of resource for the action type. If resourceType is "api", leave empty. If resourceType is "function", provide ID of the function.', true)
    ->inject('response')
    ->inject('project')
    ->inject('queueForCertificates')
    ->inject('queueForEvents')
-    ->inject('dbForPlatform')
+    ->inject('dbForConsole')
    ->inject('dbForProject')
-    ->action(function (string $domain, string $resourceType, string $resourceId, Response $response, Document $project, Certificate $queueForCertificates, Event $queueForEvents, Database $dbForPlatform, Database $dbForProject) {
-
+    ->action(function (string $domain, string $resourceType, string $resourceId, Response $response, Document $project, Certificate $queueForCertificates, Event $queueForEvents, Database $dbForConsole, 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');
-        $denyListDomains = System::getEnv('_APP_CUSTOM_DOMAIN_DENY_LIST');
+        $sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
+        $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');

-        if (!empty($denyListDomains)) {
-            $functionsDomain .= ',' . $denyListDomains;
-        }
-
-        $deniedDomains = array_map('trim', explode(',', $functionsDomain));
-
-        foreach ($deniedDomains as $deniedDomain) {
-            if (str_ends_with($domain, $deniedDomain)) {
-                throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'You cannot assign your functions domain or its subdomain to a specific resource. Please use a different domain.');
-            }
+        if (
+            ($functionsDomain !== '' && str_ends_with($domain, $functionsDomain)) ||
+            ($sitesDomain !== '' && str_ends_with($domain, $sitesDomain))
+        ) {
+            // TODO: Refactor later
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'You cannot assign your functions or sites domain or their subdomains to a specific resource. Please use a different domain.');
        }

        if ($domain === 'localhost' || $domain === APP_HOSTNAME_INTERNAL) {
            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]),
-            ]);
-        }
-
+        $ruleId = md5($domain);
+        $document = $dbForConsole->getDocument('rules', $ruleId);

        if (!$document->isEmpty()) {
            if ($document->getAttribute('projectId') === $project->getId()) {
@@ -110,18 +87,33 @@ App::post('/v1/proxy/rules')

        $resourceInternalId = '';

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

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

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

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

        try {
@@ -130,9 +122,7 @@ App::post('/v1/proxy/rules')
            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();
-
+        $ruleId = md5($domain->get());
        $rule = new Document([
            '$id' => $ruleId,
            'projectId' => $project->getId(),
@@ -142,13 +132,11 @@ App::post('/v1/proxy/rules')
            'resourceId' => $resourceId,
            'resourceInternalId' => $resourceInternalId,
            'certificateId' => '',
-            'owner' => '',
-            'region' => $project->getAttribute('region')
        ]);

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

@@ -168,7 +156,7 @@ App::post('/v1/proxy/rules')
        }

        $rule->setAttribute('status', $status);
-        $rule = $dbForPlatform->createDocument('rules', $rule);
+        $rule = $dbForConsole->createDocument('rules', $rule);

        $queueForEvents->setParam('ruleId', $rule->getId());

@@ -183,25 +171,19 @@ App::get('/v1/proxy/rules')
    ->groups(['api', 'proxy'])
    ->desc('List rules')
    ->label('scope', 'rules.read')
-    ->label('sdk', new Method(
-        namespace: 'proxy',
-        group: null,
-        name: 'listRules',
-        description: '/docs/references/proxy/list-rules.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_PROXY_RULE_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'proxy')
+    ->label('sdk.method', 'listRules')
+    ->label('sdk.description', '/docs/references/proxy/list-rules.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_PROXY_RULE_LIST)
    ->param('queries', [], new Rules(), '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. You may filter on the following attributes: ' . implode(', ', Rules::ALLOWED_ATTRIBUTES), true)
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('response')
    ->inject('project')
-    ->inject('dbForPlatform')
-    ->action(function (array $queries, string $search, Response $response, Document $project, Database $dbForPlatform) {
+    ->inject('dbForConsole')
+    ->action(function (array $queries, string $search, Response $response, Document $project, Database $dbForConsole) {
        try {
            $queries = Query::parseQueries($queries);
        } catch (QueryException $e) {
@@ -230,7 +212,7 @@ App::get('/v1/proxy/rules')
            }

            $ruleId = $cursor->getValue();
-            $cursorDocument = $dbForPlatform->getDocument('rules', $ruleId);
+            $cursorDocument = $dbForConsole->getDocument('rules', $ruleId);

            if ($cursorDocument->isEmpty()) {
                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Rule '{$ruleId}' for the 'cursor' value not found.");
@@ -241,16 +223,16 @@ App::get('/v1/proxy/rules')

        $filterQueries = Query::groupByType($queries)['filters'];

-        $rules = $dbForPlatform->find('rules', $queries);
+        $rules = $dbForConsole->find('rules', $queries);
        foreach ($rules as $rule) {
-            $certificate = $dbForPlatform->getDocument('certificates', $rule->getAttribute('certificateId', ''));
+            $certificate = $dbForConsole->getDocument('certificates', $rule->getAttribute('certificateId', ''));
            $rule->setAttribute('logs', $certificate->getAttribute('logs', ''));
            $rule->setAttribute('renewAt', $certificate->getAttribute('renewDate', ''));
        }

        $response->dynamic(new Document([
            'rules' => $rules,
-            'total' => $dbForPlatform->count('rules', $filterQueries, APP_LIMIT_COUNT),
+            'total' => $dbForConsole->count('rules', $filterQueries, APP_LIMIT_COUNT),
        ]), Response::MODEL_PROXY_RULE_LIST);
    });

@@ -258,31 +240,25 @@ App::get('/v1/proxy/rules/:ruleId')
    ->groups(['api', 'proxy'])
    ->desc('Get rule')
    ->label('scope', 'rules.read')
-    ->label('sdk', new Method(
-        namespace: 'proxy',
-        group: null,
-        name: 'getRule',
-        description: '/docs/references/proxy/get-rule.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_PROXY_RULE,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'proxy')
+    ->label('sdk.method', 'getRule')
+    ->label('sdk.description', '/docs/references/proxy/get-rule.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_PROXY_RULE)
    ->param('ruleId', '', new UID(), 'Rule ID.')
    ->inject('response')
    ->inject('project')
-    ->inject('dbForPlatform')
-    ->action(function (string $ruleId, Response $response, Document $project, Database $dbForPlatform) {
-        $rule = $dbForPlatform->getDocument('rules', $ruleId);
+    ->inject('dbForConsole')
+    ->action(function (string $ruleId, Response $response, Document $project, Database $dbForConsole) {
+        $rule = $dbForConsole->getDocument('rules', $ruleId);

        if ($rule->isEmpty() || $rule->getAttribute('projectInternalId') !== $project->getInternalId()) {
            throw new Exception(Exception::RULE_NOT_FOUND);
        }

-        $certificate = $dbForPlatform->getDocument('certificates', $rule->getAttribute('certificateId', ''));
+        $certificate = $dbForConsole->getDocument('certificates', $rule->getAttribute('certificateId', ''));
        $rule->setAttribute('logs', $certificate->getAttribute('logs', ''));
        $rule->setAttribute('renewAt', $certificate->getAttribute('renewDate', ''));

@@ -296,34 +272,26 @@ App::delete('/v1/proxy/rules/:ruleId')
    ->label('event', 'rules.[ruleId].delete')
    ->label('audits.event', 'rules.delete')
    ->label('audits.resource', 'rule/{request.ruleId}')
-    ->label('sdk', new Method(
-        namespace: 'proxy',
-        group: null,
-        name: 'deleteRule',
-        description: '/docs/references/proxy/delete-rule.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_NOCONTENT,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        contentType: ContentType::NONE
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'proxy')
+    ->label('sdk.method', 'deleteRule')
+    ->label('sdk.description', '/docs/references/proxy/delete-rule.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
+    ->label('sdk.response.model', Response::MODEL_NONE)
    ->param('ruleId', '', new UID(), 'Rule ID.')
    ->inject('response')
    ->inject('project')
-    ->inject('dbForPlatform')
+    ->inject('dbForConsole')
    ->inject('queueForDeletes')
    ->inject('queueForEvents')
-    ->action(function (string $ruleId, Response $response, Document $project, Database $dbForPlatform, Delete $queueForDeletes, Event $queueForEvents) {
-        $rule = $dbForPlatform->getDocument('rules', $ruleId);
+    ->action(function (string $ruleId, Response $response, Document $project, Database $dbForConsole, Delete $queueForDeletes, Event $queueForEvents) {
+        $rule = $dbForConsole->getDocument('rules', $ruleId);

        if ($rule->isEmpty() || $rule->getAttribute('projectInternalId') !== $project->getInternalId()) {
            throw new Exception(Exception::RULE_NOT_FOUND);
        }

-        $dbForPlatform->deleteDocument('rules', $rule->getId());
+        $dbForConsole->deleteDocument('rules', $rule->getId());

        $queueForDeletes
            ->setType(DELETE_TYPE_DOCUMENT)
@@ -341,28 +309,21 @@ App::patch('/v1/proxy/rules/:ruleId/verification')
    ->label('event', 'rules.[ruleId].update')
    ->label('audits.event', 'rule.update')
    ->label('audits.resource', 'rule/{response.$id}')
-    ->label('sdk', new Method(
-        namespace: 'proxy',
-        group: null,
-        name: 'updateRuleVerification',
-        description: '/docs/references/proxy/update-rule-verification.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_PROXY_RULE,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'proxy')
+    ->label('sdk.method', 'updateRuleVerification')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_PROXY_RULE)
    ->param('ruleId', '', new UID(), 'Rule ID.')
    ->inject('response')
    ->inject('queueForCertificates')
    ->inject('queueForEvents')
    ->inject('project')
-    ->inject('dbForPlatform')
+    ->inject('dbForConsole')
    ->inject('log')
-    ->action(function (string $ruleId, Response $response, Certificate $queueForCertificates, Event $queueForEvents, Document $project, Database $dbForPlatform, Log $log) {
-        $rule = $dbForPlatform->getDocument('rules', $ruleId);
+    ->action(function (string $ruleId, Response $response, Certificate $queueForCertificates, Event $queueForEvents, Document $project, Database $dbForConsole, Log $log) {
+        $rule = $dbForConsole->getDocument('rules', $ruleId);

        if ($rule->isEmpty() || $rule->getAttribute('projectInternalId') !== $project->getInternalId()) {
            throw new Exception(Exception::RULE_NOT_FOUND);
@@ -392,7 +353,7 @@ App::patch('/v1/proxy/rules/:ruleId/verification')
            throw new Exception(Exception::RULE_VERIFICATION_FAILED);
        }

-        $dbForPlatform->updateDocument('rules', $rule->getId(), $rule->setAttribute('status', 'verifying'));
+        $dbForConsole->updateDocument('rules', $rule->getId(), $rule->setAttribute('status', 'verifying'));

        // Issue a TLS certificate when domain is verified
        $queueForCertificates
@@ -403,8 +364,39 @@ App::patch('/v1/proxy/rules/:ruleId/verification')

        $queueForEvents->setParam('ruleId', $rule->getId());

-        $certificate = $dbForPlatform->getDocument('certificates', $rule->getAttribute('certificateId', ''));
+        $certificate = $dbForConsole->getDocument('certificates', $rule->getAttribute('certificateId', ''));
        $rule->setAttribute('logs', $certificate->getAttribute('logs', ''));

        $response->dynamic($rule, Response::MODEL_PROXY_RULE);
    });
+
+App::get('/v1/proxy/subdomains')
+    ->desc('Check if subdomain is available')
+    ->groups(['api', 'proxy'])
+    ->label('scope', 'rules.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'proxy')
+    ->label('sdk.method', 'checkSubdomain')
+    ->label('sdk.description', '/docs/references/proxy/check-subdomain.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_NONE)
+    ->param('resourceType', null, new WhiteList(['function', 'site']), 'Action definition for the rule. Possible values are "function" and "site"')
+    ->param('subdomain', '', new Text(256), 'Subdomain name.')
+    ->inject('response')
+    ->inject('dbForConsole')
+    ->action(function (string $resourceType, string $subdomain, Response $response, Database $dbForConsole) {
+        //TODO: Add tests for this endpoint
+        $resourceDomain = $resourceType === 'site' ? System::getEnv('_APP_DOMAIN_SITES', '') : System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
+        $domain = $subdomain . '.' . $resourceDomain;
+
+        $document = $dbForConsole->findOne('rules', [
+            Query::equal('domain', [$domain]),
+        ]);
+
+        if ($document && !$document->isEmpty()) {
+            throw new Exception(Exception::RULE_ALREADY_EXISTS, 'Subdomain already assigned to different project.');
+        }
+
+        $response->noContent();
+    });
@@ -8,11 +8,6 @@ use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Extend\Exception;
 use Appwrite\OpenSSL\OpenSSL;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\MethodType;
-use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Database\Validator\CustomId;
 use Appwrite\Utopia\Database\Validator\Queries\Buckets;
 use Appwrite\Utopia\Database\Validator\Queries\Files;
@@ -20,11 +15,9 @@ use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
-use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
 use Utopia\Database\Exception\NotFound as NotFoundException;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -61,19 +54,13 @@ App::post('/v1/storage/buckets')
    ->label('event', 'buckets.[bucketId].create')
    ->label('audits.event', 'bucket.create')
    ->label('audits.resource', 'bucket/{response.$id}')
-    ->label('sdk', new Method(
-        namespace: 'storage',
-        group: 'buckets',
-        name: 'createBucket',
-        description: '/docs/references/storage/create-bucket.md',
-        auth: [AuthType::KEY],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_CREATED,
-                model: Response::MODEL_BUCKET,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'storage')
+    ->label('sdk.method', 'createBucket')
+    ->label('sdk.description', '/docs/references/storage/create-bucket.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_BUCKET)
    ->param('bucketId', '', new CustomId(), 'Unique Id. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
    ->param('name', '', new Text(128), 'Bucket name')
    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of permission strings. By default, no user is granted with any permissions. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
@@ -81,20 +68,19 @@ App::post('/v1/storage/buckets')
    ->param('enabled', true, new Boolean(true), 'Is bucket enabled? When set to \'disabled\', users cannot access the files in this bucket but Server SDKs with and API key can still access the bucket. No files are lost when this is toggled.', true)
    ->param('maximumFileSize', fn (array $plan) => empty($plan['fileSize']) ? (int) System::getEnv('_APP_STORAGE_LIMIT', 0) : $plan['fileSize'] * 1000 * 1000, fn (array $plan) => new Range(1, empty($plan['fileSize']) ? (int) System::getEnv('_APP_STORAGE_LIMIT', 0) : $plan['fileSize'] * 1000 * 1000), 'Maximum file size allowed in bytes. Maximum allowed value is ' . Storage::human(System::getEnv('_APP_STORAGE_LIMIT', 0), 0) . '.', true, ['plan'])
    ->param('allowedFileExtensions', [], new ArrayList(new Text(64), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Allowed file extensions. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' extensions are allowed, each 64 characters long.', true)
-    ->param('compression', Compression::NONE, new WhiteList([Compression::NONE, Compression::GZIP, Compression::ZSTD], true), 'Compression algorithm choosen for compression. Can be one of ' . Compression::NONE . ',  [' . Compression::GZIP . '](https://en.wikipedia.org/wiki/Gzip), or [' . Compression::ZSTD . '](https://en.wikipedia.org/wiki/Zstd), For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' compression is skipped even if it\'s enabled', true)
+    ->param('compression', Compression::NONE, new WhiteList([Compression::NONE, Compression::GZIP, Compression::ZSTD]), 'Compression algorithm choosen for compression. Can be one of ' . Compression::NONE . ',  [' . Compression::GZIP . '](https://en.wikipedia.org/wiki/Gzip), or [' . Compression::ZSTD . '](https://en.wikipedia.org/wiki/Zstd), For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' compression is skipped even if it\'s enabled', true)
    ->param('encryption', true, new Boolean(true), 'Is encryption enabled? For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' encryption is skipped even if it\'s enabled', true)
    ->param('antivirus', true, new Boolean(true), 'Is virus scanning enabled? For file size above ' . Storage::human(APP_LIMIT_ANTIVIRUS, 0) . ' AntiVirus scanning is skipped even if it\'s enabled', true)
    ->inject('response')
    ->inject('dbForProject')
    ->inject('queueForEvents')
-    ->action(function (string $bucketId, string $name, ?array $permissions, bool $fileSecurity, bool $enabled, int $maximumFileSize, array $allowedFileExtensions, ?string $compression, ?bool $encryption, bool $antivirus, Response $response, Database $dbForProject, Event $queueForEvents) {
+    ->action(function (string $bucketId, string $name, ?array $permissions, bool $fileSecurity, bool $enabled, int $maximumFileSize, array $allowedFileExtensions, string $compression, bool $encryption, bool $antivirus, Response $response, Database $dbForProject, Event $queueForEvents) {

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

        // Map aggregate permissions into the multiple permissions they represent.
        $permissions = Permission::aggregate($permissions);
-        $compression ??= Compression::NONE;
-        $encryption ??= true;
+
        try {
            $files = (Config::getParam('collections', [])['buckets'] ?? [])['files'] ?? [];
            if (empty($files)) {
@@ -164,19 +150,13 @@ App::get('/v1/storage/buckets')
    ->groups(['api', 'storage'])
    ->label('scope', 'buckets.read')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
-    ->label('sdk', new Method(
-        namespace: 'storage',
-        group: 'buckets',
-        name: 'listBuckets',
-        description: '/docs/references/storage/list-buckets.md',
-        auth: [AuthType::KEY],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_BUCKET_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'storage')
+    ->label('sdk.method', 'listBuckets')
+    ->label('sdk.description', '/docs/references/storage/list-buckets.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_BUCKET_LIST)
    ->param('queries', [], new Buckets(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Buckets::ALLOWED_ATTRIBUTES), true)
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('response')
@@ -219,15 +199,10 @@ App::get('/v1/storage/buckets')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $buckets = $dbForProject->find('buckets', $queries);
-            $total = $dbForProject->count('buckets', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
        $response->dynamic(new Document([
-            'buckets' => $buckets,
-            'total' => $total,
+            'buckets' => $dbForProject->find('buckets', $queries),
+            'total' => $dbForProject->count('buckets', $filterQueries, APP_LIMIT_COUNT),
        ]), Response::MODEL_BUCKET_LIST);
    });

@@ -236,19 +211,13 @@ App::get('/v1/storage/buckets/:bucketId')
    ->groups(['api', 'storage'])
    ->label('scope', 'buckets.read')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
-    ->label('sdk', new Method(
-        namespace: 'storage',
-        group: 'buckets',
-        name: 'getBucket',
-        description: '/docs/references/storage/get-bucket.md',
-        auth: [AuthType::KEY],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_BUCKET,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'storage')
+    ->label('sdk.method', 'getBucket')
+    ->label('sdk.description', '/docs/references/storage/get-bucket.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_BUCKET)
    ->param('bucketId', '', new UID(), 'Bucket unique ID.')
    ->inject('response')
    ->inject('dbForProject')
@@ -271,19 +240,13 @@ App::put('/v1/storage/buckets/:bucketId')
    ->label('event', 'buckets.[bucketId].update')
    ->label('audits.event', 'bucket.update')
    ->label('audits.resource', 'bucket/{response.$id}')
-    ->label('sdk', new Method(
-        namespace: 'storage',
-        group: 'buckets',
-        name: 'updateBucket',
-        description: '/docs/references/storage/update-bucket.md',
-        auth: [AuthType::KEY],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_BUCKET,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'storage')
+    ->label('sdk.method', 'updateBucket')
+    ->label('sdk.description', '/docs/references/storage/update-bucket.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_BUCKET)
    ->param('bucketId', '', new UID(), 'Bucket unique ID.')
    ->param('name', null, new Text(128), 'Bucket name', false)
    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of permission strings. By default, the current permissions are inherited. [Learn more about permissions](https://appwrite.io/docs/permissions).', true)
@@ -291,13 +254,13 @@ App::put('/v1/storage/buckets/:bucketId')
    ->param('enabled', true, new Boolean(true), 'Is bucket enabled? When set to \'disabled\', users cannot access the files in this bucket but Server SDKs with and API key can still access the bucket. No files are lost when this is toggled.', true)
    ->param('maximumFileSize', fn (array $plan) => empty($plan['fileSize']) ? (int) System::getEnv('_APP_STORAGE_LIMIT', 0) : $plan['fileSize'] * 1000 * 1000, fn (array $plan) => new Range(1, empty($plan['fileSize']) ? (int) System::getEnv('_APP_STORAGE_LIMIT', 0) : $plan['fileSize'] * 1000 * 1000), 'Maximum file size allowed in bytes. Maximum allowed value is ' . Storage::human(System::getEnv('_APP_STORAGE_LIMIT', 0), 0) . '.', true, ['plan'])
    ->param('allowedFileExtensions', [], new ArrayList(new Text(64), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Allowed file extensions. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' extensions are allowed, each 64 characters long.', true)
-    ->param('compression', Compression::NONE, new WhiteList([Compression::NONE, Compression::GZIP, Compression::ZSTD], true), 'Compression algorithm choosen for compression. Can be one of ' . Compression::NONE . ', [' . Compression::GZIP . '](https://en.wikipedia.org/wiki/Gzip), or [' . Compression::ZSTD . '](https://en.wikipedia.org/wiki/Zstd), For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' compression is skipped even if it\'s enabled', true)
+    ->param('compression', Compression::NONE, new WhiteList([Compression::NONE, Compression::GZIP, Compression::ZSTD]), 'Compression algorithm choosen for compression. Can be one of ' . Compression::NONE . ', [' . Compression::GZIP . '](https://en.wikipedia.org/wiki/Gzip), or [' . Compression::ZSTD . '](https://en.wikipedia.org/wiki/Zstd), For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' compression is skipped even if it\'s enabled', true)
    ->param('encryption', true, new Boolean(true), 'Is encryption enabled? For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' encryption is skipped even if it\'s enabled', true)
    ->param('antivirus', true, new Boolean(true), 'Is virus scanning enabled? For file size above ' . Storage::human(APP_LIMIT_ANTIVIRUS, 0) . ' AntiVirus scanning is skipped even if it\'s enabled', true)
    ->inject('response')
    ->inject('dbForProject')
    ->inject('queueForEvents')
-    ->action(function (string $bucketId, string $name, ?array $permissions, bool $fileSecurity, bool $enabled, ?int $maximumFileSize, array $allowedFileExtensions, ?string $compression, ?bool $encryption, bool $antivirus, Response $response, Database $dbForProject, Event $queueForEvents) {
+    ->action(function (string $bucketId, string $name, ?array $permissions, bool $fileSecurity, bool $enabled, ?int $maximumFileSize, array $allowedFileExtensions, string $compression, bool $encryption, bool $antivirus, Response $response, Database $dbForProject, Event $queueForEvents) {
        $bucket = $dbForProject->getDocument('buckets', $bucketId);

        if ($bucket->isEmpty()) {
@@ -310,7 +273,6 @@ App::put('/v1/storage/buckets/:bucketId')
        $enabled ??= $bucket->getAttribute('enabled', true);
        $encryption ??= $bucket->getAttribute('encryption', true);
        $antivirus ??= $bucket->getAttribute('antivirus', true);
-        $compression ??= $bucket->getAttribute('compression', Compression::NONE);

        // Map aggregate permissions into the multiple permissions they represent.
        $permissions = Permission::aggregate($permissions);
@@ -342,20 +304,12 @@ App::delete('/v1/storage/buckets/:bucketId')
    ->label('audits.event', 'bucket.delete')
    ->label('event', 'buckets.[bucketId].delete')
    ->label('audits.resource', 'bucket/{request.bucketId}')
-    ->label('sdk', new Method(
-        namespace: 'storage',
-        group: 'buckets',
-        name: 'deleteBucket',
-        description: '/docs/references/storage/delete-bucket.md',
-        auth: [AuthType::KEY],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_NOCONTENT,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        contentType: ContentType::NONE
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'storage')
+    ->label('sdk.method', 'deleteBucket')
+    ->label('sdk.description', '/docs/references/storage/delete-bucket.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
+    ->label('sdk.response.model', Response::MODEL_NONE)
    ->param('bucketId', '', new UID(), 'Bucket unique ID.')
    ->inject('response')
    ->inject('dbForProject')
@@ -396,21 +350,15 @@ App::post('/v1/storage/buckets/:bucketId/files')
    ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId},chunkId:{chunkId}')
    ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT)
    ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
-    ->label('sdk', new Method(
-        namespace: 'storage',
-        group: 'files',
-        name: 'createFile',
-        description: '/docs/references/storage/create-file.md',
-        type: MethodType::UPLOAD,
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        requestType: 'multipart/form-data',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_CREATED,
-                model: Response::MODEL_FILE,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'storage')
+    ->label('sdk.method', 'createFile')
+    ->label('sdk.description', '/docs/references/storage/create-file.md')
+    ->label('sdk.request.type', 'multipart/form-data')
+    ->label('sdk.methodType', 'upload')
+    ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_FILE)
    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
    ->param('fileId', '', new CustomId(), 'File ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
    ->param('file', [], new File(), 'Binary file. Appwrite SDKs provide helpers to handle file input. [Learn about file input](https://appwrite.io/docs/products/storage/upload-download#input-file).', skipValidation: true)
@@ -766,19 +714,13 @@ App::get('/v1/storage/buckets/:bucketId/files')
    ->groups(['api', 'storage'])
    ->label('scope', 'files.read')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
-    ->label('sdk', new Method(
-        namespace: 'storage',
-        group: 'files',
-        name: 'listFiles',
-        description: '/docs/references/storage/list-files.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_FILE_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'storage')
+    ->label('sdk.method', 'listFiles')
+    ->label('sdk.description', '/docs/references/storage/list-files.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_FILE_LIST)
    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
    ->param('queries', [], new Files(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Files::ALLOWED_ATTRIBUTES), true)
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
@@ -850,8 +792,6 @@ App::get('/v1/storage/buckets/:bucketId/files')
            }
        } catch (NotFoundException) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
        }

        $response->dynamic(new Document([
@@ -866,19 +806,13 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId')
    ->groups(['api', 'storage'])
    ->label('scope', 'files.read')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
-    ->label('sdk', new Method(
-        namespace: 'storage',
-        group: 'files',
-        name: 'getFile',
-        description: '/docs/references/storage/get-file.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_FILE,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'storage')
+    ->label('sdk.method', 'getFile')
+    ->label('sdk.description', '/docs/references/storage/get-file.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_FILE)
    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
    ->param('fileId', '', new UID(), 'File ID.')
    ->inject('response')
@@ -923,21 +857,13 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
    ->label('cache', true)
    ->label('cache.resourceType', 'bucket/{request.bucketId}')
    ->label('cache.resource', 'file/{request.fileId}')
-    ->label('sdk', new Method(
-        namespace: 'storage',
-        group: 'files',
-        name: 'getFilePreview',
-        description: '/docs/references/storage/get-file-preview.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_NONE
-            )
-        ],
-        type: MethodType::LOCATION,
-        contentType: ContentType::IMAGE
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'storage')
+    ->label('sdk.method', 'getFilePreview')
+    ->label('sdk.description', '/docs/references/storage/get-file-preview.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_IMAGE)
+    ->label('sdk.methodType', 'location')
    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
    ->param('fileId', '', new UID(), 'File ID')
    ->param('width', 0, new Range(0, 4000), 'Resize preview image width, Pass an integer between 0 to 4000.', true)
@@ -951,11 +877,14 @@ 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) {
+    ->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) {

        if (!\extension_loaded('imagick')) {
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Imagick extension is missing');
@@ -1083,19 +1012,11 @@ 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));
-            }
-        }
-
        $response
            ->addHeader('Cache-Control', 'private, max-age=2592000') // 30 days
            ->setContentType($contentType)
-            ->file($data);
+            ->file($data)
+        ;

        unset($image);
    });
@@ -1106,21 +1027,13 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
    ->groups(['api', 'storage'])
    ->label('scope', 'files.read')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
-    ->label('sdk', new Method(
-        namespace: 'storage',
-        group: 'files',
-        name: 'getFileDownload',
-        description: '/docs/references/storage/get-file-download.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_NONE
-            )
-        ],
-        type: MethodType::LOCATION,
-        contentType: ContentType::ANY,
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'storage')
+    ->label('sdk.method', 'getFileDownload')
+    ->label('sdk.description', '/docs/references/storage/get-file-download.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', '*/*')
+    ->label('sdk.methodType', 'location')
    ->param('bucketId', '', new UID(), 'Storage bucket ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
    ->param('fileId', '', new UID(), 'File ID.')
    ->inject('request')
@@ -1255,21 +1168,13 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
    ->groups(['api', 'storage'])
    ->label('scope', 'files.read')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
-    ->label('sdk', new Method(
-        namespace: 'storage',
-        group: 'files',
-        name: 'getFileView',
-        description: '/docs/references/storage/get-file-view.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        type: MethodType::LOCATION,
-        contentType: ContentType::ANY,
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'storage')
+    ->label('sdk.method', 'getFileView')
+    ->label('sdk.description', '/docs/references/storage/get-file-view.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', '*/*')
+    ->label('sdk.methodType', 'location')
    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
    ->param('fileId', '', new UID(), 'File ID.')
    ->inject('response')
@@ -1415,6 +1320,9 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
    ->groups(['api', 'storage'])
    ->label('scope', 'public')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', '*/*')
+    ->label('sdk.methodType', 'location')
    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
    ->param('fileId', '', new UID(), 'File ID.')
    ->param('jwt', '', new Text(2048, 0), 'JSON Web Token to validate', true)
@@ -1573,19 +1481,13 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
    ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
    ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT)
    ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
-    ->label('sdk', new Method(
-        namespace: 'storage',
-        group: 'files',
-        name: 'updateFile',
-        description: '/docs/references/storage/update-file.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_FILE,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'storage')
+    ->label('sdk.method', 'updateFile')
+    ->label('sdk.description', '/docs/references/storage/update-file.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_FILE)
    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
    ->param('fileId', '', new UID(), 'File unique ID.')
    ->param('name', null, new Text(255), 'Name of the file', true)
@@ -1688,20 +1590,12 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
    ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
    ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT)
    ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
-    ->label('sdk', new Method(
-        namespace: 'storage',
-        group: 'files',
-        name: 'deleteFile',
-        description: '/docs/references/storage/delete-file.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_NOCONTENT,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        contentType: ContentType::NONE
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'storage')
+    ->label('sdk.method', 'deleteFile')
+    ->label('sdk.description', '/docs/references/storage/delete-file.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
+    ->label('sdk.response.model', Response::MODEL_NONE)
    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
    ->param('fileId', '', new UID(), 'File ID.')
    ->inject('response')
@@ -1788,19 +1682,12 @@ App::get('/v1/storage/usage')
    ->groups(['api', 'storage'])
    ->label('scope', 'files.read')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
-    ->label('sdk', new Method(
-        namespace: 'storage',
-        group: null,
-        name: 'getUsage',
-        description: '/docs/references/storage/get-usage.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_USAGE_STORAGE,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'storage')
+    ->label('sdk.method', 'getUsage')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_USAGE_STORAGE)
    ->param('range', '30d', new WhiteList(['24h', '30d', '90d'], true), 'Date range.', true)
    ->inject('response')
    ->inject('dbForProject')
@@ -1875,28 +1762,18 @@ App::get('/v1/storage/:bucketId/usage')
    ->groups(['api', 'storage'])
    ->label('scope', 'files.read')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
-    ->label('sdk', new Method(
-        namespace: 'storage',
-        group: null,
-        name: 'getBucketUsage',
-        description: '/docs/references/storage/get-bucket-usage.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_USAGE_BUCKETS,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'storage')
+    ->label('sdk.method', 'getBucketUsage')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_USAGE_BUCKETS)
    ->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()) {
@@ -1909,16 +1786,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'])
                ]);
@@ -1926,7 +1799,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),
@@ -1967,7 +1840,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,23 +8,16 @@ use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Mail;
 use Appwrite\Event\Messaging;
-use Appwrite\Event\StatsUsage;
 use Appwrite\Extend\Exception;
 use Appwrite\Network\Validator\Email;
 use Appwrite\Platform\Workers\Deletes;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Template\Template;
 use Appwrite\Utopia\Database\Validator\CustomId;
 use Appwrite\Utopia\Database\Validator\Queries\Memberships;
 use Appwrite\Utopia\Database\Validator\Queries\Teams;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
-use libphonenumber\PhoneNumberUtil;
 use MaxMind\Db\Reader;
-use Utopia\Abuse\Abuse;
 use Utopia\App;
 use Utopia\Audit\Audit;
 use Utopia\Config\Config;
@@ -33,7 +26,6 @@ use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Authorization as AuthorizationException;
 use Utopia\Database\Exception\Duplicate;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -61,19 +53,13 @@ App::post('/v1/teams')
    ->label('scope', 'teams.write')
    ->label('audits.event', 'team.create')
    ->label('audits.resource', 'team/{response.$id}')
-    ->label('sdk', new Method(
-        namespace: 'teams',
-        group: 'teams',
-        name: 'create',
-        description: '/docs/references/teams/create-team.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_CREATED,
-                model: Response::MODEL_TEAM,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'teams')
+    ->label('sdk.method', 'create')
+    ->label('sdk.description', '/docs/references/teams/create-team.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_TEAM)
    ->param('teamId', '', new CustomId(), 'Team ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
    ->param('name', null, new Text(128), 'Team name. Max length: 128 chars.')
    ->param('roles', ['owner'], new ArrayList(new Key(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of strings. Use this param to set the roles in the team for the user who created it. The default role is **owner**. A role can be any string. Learn more about [roles and permissions](https://appwrite.io/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 32 characters long.', true)
@@ -152,19 +138,14 @@ App::get('/v1/teams')
    ->desc('List teams')
    ->groups(['api', 'teams'])
    ->label('scope', 'teams.read')
-    ->label('sdk', new Method(
-        namespace: 'teams',
-        group: 'teams',
-        name: 'list',
-        description: '/docs/references/teams/list-teams.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_TEAM_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'teams')
+    ->label('sdk.method', 'list')
+    ->label('sdk.description', '/docs/references/teams/list-teams.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_TEAM_LIST)
+    ->label('sdk.offline.model', '/teams')
    ->param('queries', [], new Teams(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Teams::ALLOWED_ATTRIBUTES), true)
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('response')
@@ -207,12 +188,9 @@ App::get('/v1/teams')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $results = $dbForProject->find('teams', $queries);
-            $total = $dbForProject->count('teams', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
+        $results = $dbForProject->find('teams', $queries);
+        $total = $dbForProject->count('teams', $filterQueries, APP_LIMIT_COUNT);

        $response->dynamic(new Document([
            'teams' => $results,
@@ -224,19 +202,15 @@ App::get('/v1/teams/:teamId')
    ->desc('Get team')
    ->groups(['api', 'teams'])
    ->label('scope', 'teams.read')
-    ->label('sdk', new Method(
-        namespace: 'teams',
-        group: 'teams',
-        name: 'get',
-        description: '/docs/references/teams/get-team.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_TEAM,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'teams')
+    ->label('sdk.method', 'get')
+    ->label('sdk.description', '/docs/references/teams/get-team.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_TEAM)
+    ->label('sdk.offline.model', '/teams')
+    ->label('sdk.offline.key', '{teamId}')
    ->param('teamId', '', new UID(), 'Team ID.')
    ->inject('response')
    ->inject('dbForProject')
@@ -255,19 +229,14 @@ App::get('/v1/teams/:teamId/prefs')
    ->desc('Get team preferences')
    ->groups(['api', 'teams'])
    ->label('scope', 'teams.read')
-    ->label('sdk', new Method(
-        namespace: 'teams',
-        group: 'teams',
-        name: 'getPrefs',
-        description: '/docs/references/teams/get-team-prefs.md',
-        auth: [AuthType::SESSION, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_PREFERENCES,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'teams')
+    ->label('sdk.method', 'getPrefs')
+    ->label('sdk.description', '/docs/references/teams/get-team-prefs.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_PREFERENCES)
+    ->label('sdk.offline.model', '/teams/{teamId}/prefs')
    ->param('teamId', '', new UID(), 'Team ID.')
    ->inject('response')
    ->inject('dbForProject')
@@ -291,19 +260,15 @@ App::put('/v1/teams/:teamId')
    ->label('scope', 'teams.write')
    ->label('audits.event', 'team.update')
    ->label('audits.resource', 'team/{response.$id}')
-    ->label('sdk', new Method(
-        namespace: 'teams',
-        group: 'teams',
-        name: 'updateName',
-        description: '/docs/references/teams/update-team-name.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_TEAM,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'teams')
+    ->label('sdk.method', 'updateName')
+    ->label('sdk.description', '/docs/references/teams/update-team-name.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_TEAM)
+    ->label('sdk.offline.model', '/teams')
+    ->label('sdk.offline.key', '{teamId}')
    ->param('teamId', '', new UID(), 'Team ID.')
    ->param('name', null, new Text(128), 'New team name. Max length: 128 chars.')
    ->inject('requestTimestamp')
@@ -339,19 +304,14 @@ App::put('/v1/teams/:teamId/prefs')
    ->label('audits.event', 'team.update')
    ->label('audits.resource', 'team/{response.$id}')
    ->label('audits.userId', '{response.$id}')
-    ->label('sdk', new Method(
-        namespace: 'teams',
-        group: 'teams',
-        name: 'updatePrefs',
-        description: '/docs/references/teams/update-team-prefs.md',
-        auth: [AuthType::SESSION, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_PREFERENCES,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'teams')
+    ->label('sdk.method', 'updatePrefs')
+    ->label('sdk.description', '/docs/references/teams/update-team-prefs.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_PREFERENCES)
+    ->label('sdk.offline.model', '/teams/{teamId}/prefs')
    ->param('teamId', '', new UID(), 'Team ID.')
    ->param('prefs', '', new Assoc(), 'Prefs key-value JSON object.')
    ->inject('response')
@@ -379,20 +339,12 @@ App::delete('/v1/teams/:teamId')
    ->label('scope', 'teams.write')
    ->label('audits.event', 'team.delete')
    ->label('audits.resource', 'team/{request.teamId}')
-    ->label('sdk', new Method(
-        namespace: 'teams',
-        group: 'teams',
-        name: 'delete',
-        description: '/docs/references/teams/delete-team.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_NOCONTENT,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        contentType: ContentType::NONE
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'teams')
+    ->label('sdk.method', 'delete')
+    ->label('sdk.description', '/docs/references/teams/delete-team.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
+    ->label('sdk.response.model', Response::MODEL_NONE)
    ->param('teamId', '', new UID(), 'Team ID.')
    ->inject('response')
    ->inject('getProjectDB')
@@ -438,19 +390,13 @@ App::post('/v1/teams/:teamId/memberships')
    ->label('audits.event', 'membership.create')
    ->label('audits.resource', 'team/{request.teamId}')
    ->label('audits.userId', '{request.userId}')
-    ->label('sdk', new Method(
-        namespace: 'teams',
-        group: 'memberships',
-        name: 'createMembership',
-        description: '/docs/references/teams/create-team-membership.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_CREATED,
-                model: Response::MODEL_MEMBERSHIP,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'teams')
+    ->label('sdk.method', 'createMembership')
+    ->label('sdk.description', '/docs/references/teams/create-team-membership.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MEMBERSHIP)
    ->label('abuse-limit', 10)
    ->param('teamId', '', new UID(), 'Team ID.')
    ->param('email', '', new Email(), 'Email of the new team member.', true)
@@ -477,16 +423,13 @@ App::post('/v1/teams/:teamId/memberships')
    ->inject('queueForMails')
    ->inject('queueForMessaging')
    ->inject('queueForEvents')
-    ->inject('timelimit')
-    ->inject('queueForStatsUsage')
-    ->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) {
+        $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');
            }
        }
@@ -494,13 +437,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()) {
@@ -519,7 +464,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) {
@@ -595,64 +540,49 @@ App::post('/v1/teams/:teamId/memberships')
            throw new Exception(Exception::USER_UNAUTHORIZED, 'User is not allowed to send invitations for this team');
        }

-        $membership = $dbForProject->findOne('memberships', [
-            Query::equal('userInternalId', [$invitee->getInternalId()]),
-            Query::equal('teamInternalId', [$team->getInternalId()]),
+        $secret = Auth::tokenGenerator();
+
+        $membershipId = ID::unique();
+        $membership = new Document([
+            '$id' => $membershipId,
+            '$permissions' => [
+                Permission::read(Role::any()),
+                Permission::update(Role::user($invitee->getId())),
+                Permission::update(Role::team($team->getId(), 'owner')),
+                Permission::delete(Role::user($invitee->getId())),
+                Permission::delete(Role::team($team->getId(), 'owner')),
+            ],
+            'userId' => $invitee->getId(),
+            'userInternalId' => $invitee->getInternalId(),
+            'teamId' => $team->getId(),
+            'teamInternalId' => $team->getInternalId(),
+            'roles' => $roles,
+            'invited' => DateTime::now(),
+            'joined' => ($isPrivilegedUser || $isAppUser) ? DateTime::now() : null,
+            'confirm' => ($isPrivilegedUser || $isAppUser),
+            'secret' => Auth::hash($secret),
+            'search' => implode(' ', [$membershipId, $invitee->getId()])
        ]);

-        $secret = Auth::tokenGenerator();
-        if ($membership->isEmpty()) {
-            $membershipId = ID::unique();
-            $membership = new Document([
-                '$id' => $membershipId,
-                '$permissions' => [
-                    Permission::read(Role::any()),
-                    Permission::update(Role::user($invitee->getId())),
-                    Permission::update(Role::team($team->getId(), 'owner')),
-                    Permission::delete(Role::user($invitee->getId())),
-                    Permission::delete(Role::team($team->getId(), 'owner')),
-                ],
-                'userId' => $invitee->getId(),
-                'userInternalId' => $invitee->getInternalId(),
-                'teamId' => $team->getId(),
-                'teamInternalId' => $team->getInternalId(),
-                'roles' => $roles,
-                'invited' => DateTime::now(),
-                'joined' => ($isPrivilegedUser || $isAppUser) ? DateTime::now() : null,
-                'confirm' => ($isPrivilegedUser || $isAppUser),
-                'secret' => Auth::hash($secret),
-                'search' => implode(' ', [$membershipId, $invitee->getId()])
-            ]);
-
-            $membership = ($isPrivilegedUser || $isAppUser) ?
-                Authorization::skip(fn () => $dbForProject->createDocument('memberships', $membership)) :
-                $dbForProject->createDocument('memberships', $membership);
-
-            if ($isPrivilegedUser || $isAppUser) {
-                Authorization::skip(fn () => $dbForProject->increaseDocumentAttribute('teams', $team->getId(), 'total', 1));
+        if ($isPrivilegedUser || $isAppUser) { // Allow admin to create membership
+            try {
+                $membership = Authorization::skip(fn () => $dbForProject->createDocument('memberships', $membership));
+            } catch (Duplicate $th) {
+                throw new Exception(Exception::TEAM_INVITE_ALREADY_EXISTS);
            }

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

-            if ($isPrivilegedUser || $isAppUser) {
-                $membership->setAttribute('joined', DateTime::now());
-                $membership->setAttribute('confirm', true);
-            }
-
-            $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 {
+            try {
+                $membership = $dbForProject->createDocument('memberships', $membership);
+            } catch (Duplicate $th) {
+                throw new Exception(Exception::TEAM_INVITE_ALREADY_EXISTS);
+            }
+
            $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]');
@@ -720,7 +650,7 @@ App::post('/v1/teams/:teamId/memberships')
                    'owner' => $user->getAttribute('name'),
                    'direction' => $locale->getText('settings.direction'),
                    /* {{user}}, {{team}}, {{redirect}} and {{project}} are required in default and custom templates */
-                    'user' => $name,
+                    'user' => $user->getAttribute('name'),
                    'team' => $team->getAttribute('name'),
                    'redirect' => $url,
                    'project' => $projectName
@@ -730,10 +660,10 @@ 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();
-
+                    ->trigger()
+                ;
            } elseif (!empty($phone)) {
                if (empty(System::getEnv('_APP_SMS_PROVIDER'))) {
                    throw new Exception(Exception::GENERAL_PHONE_DISABLED, 'Phone provider not configured');
@@ -761,27 +691,6 @@ App::post('/v1/teams/:teamId/memberships')
                    ->setMessage($messageDoc)
                    ->setRecipients([$phone])
                    ->setProviderType('SMS');
-
-                if (isset($plan['authPhone'])) {
-                    $timelimit = $timelimit('organization:{organizationId}', $plan['authPhone'], 30 * 24 * 60 * 60); // 30 days
-                    $timelimit
-                        ->setParam('{organizationId}', $project->getAttribute('teamId'));
-
-                    $abuse = new Abuse($timelimit);
-                    if ($abuse->check() && System::getEnv('_APP_OPTIONS_ABUSE', 'enabled') === 'enabled') {
-                        $helper = PhoneNumberUtil::getInstance();
-                        $countryCode = $helper->parse($phone)->getCountryCode();
-
-                        if (!empty($countryCode)) {
-                            $queueForStatsUsage
-                                ->addMetric(str_replace('{countryCode}', $countryCode, METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE), 1);
-                        }
-                    }
-                    $queueForStatsUsage
-                        ->addMetric(METRIC_AUTH_METHOD_PHONE, 1)
-                        ->setProject($project)
-                        ->trigger();
-                }
            }
        }

@@ -806,19 +715,14 @@ App::get('/v1/teams/:teamId/memberships')
    ->desc('List team memberships')
    ->groups(['api', 'teams'])
    ->label('scope', 'teams.read')
-    ->label('sdk', new Method(
-        namespace: 'teams',
-        group: 'memberships',
-        name: 'listMemberships',
-        description: '/docs/references/teams/list-team-members.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_MEMBERSHIP_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'teams')
+    ->label('sdk.method', 'listMemberships')
+    ->label('sdk.description', '/docs/references/teams/list-team-members.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MEMBERSHIP_LIST)
+    ->label('sdk.offline.model', '/teams/{teamId}/memberships')
    ->param('teamId', '', new UID(), 'Team ID.')
    ->param('queries', [], new Memberships(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Memberships::ALLOWED_ATTRIBUTES), true)
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
@@ -872,20 +776,17 @@ App::get('/v1/teams/:teamId/memberships')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $memberships = $dbForProject->find(
-                collection: 'memberships',
-                queries: $queries,
-            );
-            $total = $dbForProject->count(
-                collection: 'memberships',
-                queries: $filterQueries,
-                max: APP_LIMIT_COUNT
-            );
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }

+        $memberships = $dbForProject->find(
+            collection: 'memberships',
+            queries: $queries,
+        );
+
+        $total = $dbForProject->count(
+            collection: 'memberships',
+            queries: $filterQueries,
+            max: APP_LIMIT_COUNT
+        );

        $memberships = array_filter($memberships, fn (Document $membership) => !empty($membership->getAttribute('userId')));

@@ -948,19 +849,15 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
    ->desc('Get team membership')
    ->groups(['api', 'teams'])
    ->label('scope', 'teams.read')
-    ->label('sdk', new Method(
-        namespace: 'teams',
-        group: 'memberships',
-        name: 'getMembership',
-        description: '/docs/references/teams/get-team-member.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_MEMBERSHIP,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'teams')
+    ->label('sdk.method', 'getMembership')
+    ->label('sdk.description', '/docs/references/teams/get-team-member.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MEMBERSHIP)
+    ->label('sdk.offline.model', '/teams/{teamId}/memberships')
+    ->label('sdk.offline.key', '{membershipId}')
    ->param('teamId', '', new UID(), 'Team ID.')
    ->param('membershipId', '', new UID(), 'Membership ID.')
    ->inject('response')
@@ -1035,23 +932,18 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
    ->label('scope', 'teams.write')
    ->label('audits.event', 'membership.update')
    ->label('audits.resource', 'team/{request.teamId}')
-    ->label('sdk', new Method(
-        namespace: 'teams',
-        group: 'memberships',
-        name: 'updateMembership',
-        description: '/docs/references/teams/update-team-membership.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_MEMBERSHIP,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'teams')
+    ->label('sdk.method', 'updateMembership')
+    ->label('sdk.description', '/docs/references/teams/update-team-membership.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MEMBERSHIP)
    ->param('teamId', '', new UID(), 'Team ID.')
    ->param('membershipId', '', new UID(), 'Membership ID.')
    ->param('roles', [], function (Document $project) {
        if ($project->getId() === 'console') {
+            ;
            $roles = array_keys(Config::getParam('roles', []));
            array_filter($roles, function ($role) {
                return !in_array($role, [Auth::USER_ROLE_APPS, Auth::USER_ROLE_GUESTS, Auth::USER_ROLE_USERS]);
@@ -1063,10 +955,9 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
    ->inject('request')
    ->inject('response')
    ->inject('user')
-    ->inject('project')
    ->inject('dbForProject')
    ->inject('queueForEvents')
-    ->action(function (string $teamId, string $membershipId, array $roles, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Event $queueForEvents) {
+    ->action(function (string $teamId, string $membershipId, array $roles, Request $request, Response $response, Document $user, Database $dbForProject, Event $queueForEvents) {

        $team = $dbForProject->getDocument('teams', $teamId);
        if ($team->isEmpty()) {
@@ -1087,21 +978,6 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
        $isAppUser = Auth::isAppUser(Authorization::getRoles());
        $isOwner = Authorization::isRole('team:' . $team->getId() . '/owner');

-        if ($project->getId() === 'console') {
-            // Quick check: fetch up to 2 owners to determine if only one exists
-            $ownersCount = $dbForProject->count(
-                collection: 'memberships',
-                queries: [Query::contains('roles', ['owner'])],
-                max: 2
-            );
-
-            // Prevent role change if there's only one owner left,
-            // the requester is that owner, and the new `$roles` no longer include 'owner'!
-            if ($ownersCount === 1 && $isOwner && !\in_array('owner', $roles)) {
-                throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'There must be at least one owner in the organization.');
-            }
-        }
-
        if (!$isOwner && !$isPrivilegedUser && !$isAppUser) { // Not owner, not admin, not app (server)
            throw new Exception(Exception::USER_UNAUTHORIZED, 'User is not allowed to modify roles');
        }
@@ -1139,19 +1015,13 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
    ->label('audits.event', 'membership.update')
    ->label('audits.resource', 'team/{request.teamId}')
    ->label('audits.userId', '{request.userId}')
-    ->label('sdk', new Method(
-        namespace: 'teams',
-        group: 'memberships',
-        name: 'updateMembershipStatus',
-        description: '/docs/references/teams/update-team-membership-status.md',
-        auth: [AuthType::SESSION, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_MEMBERSHIP,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'teams')
+    ->label('sdk.method', 'updateMembershipStatus')
+    ->label('sdk.description', '/docs/references/teams/update-team-membership-status.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MEMBERSHIP)
    ->param('teamId', '', new UID(), 'Team ID.')
    ->param('membershipId', '', new UID(), 'Membership ID.')
    ->param('userId', '', new UID(), 'User ID.')
@@ -1190,8 +1060,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
            throw new Exception(Exception::TEAM_INVITE_MISMATCH, 'Invite does not belong to current user (' . $user->getAttribute('email') . ')');
        }

-        $hasSession = !$user->isEmpty();
-        if (!$hasSession) {
+        if ($user->isEmpty()) {
            $user->setAttributes($dbForProject->getDocument('users', $userId)->getArrayCopy()); // Get user
        }

@@ -1210,64 +1079,39 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')

        Authorization::skip(fn () => $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('emailVerification', true)));

-        // Create session for the user if not logged in
-        if (!$hasSession) {
-            Authorization::setRole(Role::user($user->getId())->toString());
+        // Log user in

-            $detector = new Detector($request->getUserAgent('UNKNOWN'));
-            $record = $geodb->get($request->getIP());
-            $authDuration = $project->getAttribute('auths', [])['duration'] ?? Auth::TOKEN_EXPIRATION_LOGIN_LONG;
-            $expire = DateTime::addSeconds(new \DateTime(), $authDuration);
-            $secret = Auth::tokenGenerator();
-            $session = new Document(array_merge([
-                '$id' => ID::unique(),
-                '$permissions' => [
-                    Permission::read(Role::user($user->getId())),
-                    Permission::update(Role::user($user->getId())),
-                    Permission::delete(Role::user($user->getId())),
-                ],
-                'userId' => $user->getId(),
-                'userInternalId' => $user->getInternalId(),
-                'provider' => Auth::SESSION_PROVIDER_EMAIL,
-                'providerUid' => $user->getAttribute('email'),
-                'secret' => Auth::hash($secret), // One way hash encryption to protect DB leak
-                'userAgent' => $request->getUserAgent('UNKNOWN'),
-                'ip' => $request->getIP(),
-                'factors' => ['email'],
-                'countryCode' => ($record) ? \strtolower($record['country']['iso_code']) : '--',
-                'expire' => DateTime::addSeconds(new \DateTime(), $authDuration)
-            ], $detector->getOS(), $detector->getClient(), $detector->getDevice()));
+        Authorization::setRole(Role::user($user->getId())->toString());

-            $session = $dbForProject->createDocument('sessions', $session);
+        $detector = new Detector($request->getUserAgent('UNKNOWN'));
+        $record = $geodb->get($request->getIP());
+        $authDuration = $project->getAttribute('auths', [])['duration'] ?? Auth::TOKEN_EXPIRATION_LOGIN_LONG;
+        $expire = DateTime::addSeconds(new \DateTime(), $authDuration);
+        $secret = Auth::tokenGenerator();
+        $session = new Document(array_merge([
+            '$id' => ID::unique(),
+            'userId' => $user->getId(),
+            'userInternalId' => $user->getInternalId(),
+            'provider' => Auth::SESSION_PROVIDER_EMAIL,
+            'providerUid' => $user->getAttribute('email'),
+            'secret' => Auth::hash($secret), // One way hash encryption to protect DB leak
+            'userAgent' => $request->getUserAgent('UNKNOWN'),
+            'ip' => $request->getIP(),
+            'factors' => ['email'],
+            'countryCode' => ($record) ? \strtolower($record['country']['iso_code']) : '--',
+            'expire' => DateTime::addSeconds(new \DateTime(), $authDuration)
+        ], $detector->getOS(), $detector->getClient(), $detector->getDevice()));

-            Authorization::setRole(Role::user($userId)->toString());
+        $session = $dbForProject->createDocument('sessions', $session
+            ->setAttribute('$permissions', [
+                Permission::read(Role::user($user->getId())),
+                Permission::update(Role::user($user->getId())),
+                Permission::delete(Role::user($user->getId())),
+            ]));

-            if (!Config::getParam('domainVerification')) {
-                $response->addHeader('X-Fallback-Cookies', \json_encode([Auth::$cookieName => Auth::encodeSession($user->getId(), $secret)]));
-            }
+        $dbForProject->purgeCachedDocument('users', $user->getId());

-            $response
-                ->addCookie(
-                    name: Auth::$cookieName . '_legacy',
-                    value: Auth::encodeSession($user->getId(), $secret),
-                    expire: (new \DateTime($expire))->getTimestamp(),
-                    path: '/',
-                    domain: Config::getParam('cookieDomain'),
-                    secure: ('https' === $protocol),
-                    httponly: true
-                )
-                ->addCookie(
-                    name: Auth::$cookieName,
-                    value: Auth::encodeSession($user->getId(), $secret),
-                    expire: (new \DateTime($expire))->getTimestamp(),
-                    path: '/',
-                    domain: Config::getParam('cookieDomain'),
-                    secure: ('https' === $protocol),
-                    httponly: true,
-                    sameSite: Config::getParam('cookieSamesite')
-                )
-            ;
-        }
+        Authorization::setRole(Role::user($userId)->toString());

        $membership = $dbForProject->updateDocument('memberships', $membership->getId(), $membership);

@@ -1281,11 +1125,22 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
            ->setParam('membershipId', $membership->getId())
        ;

+        if (!Config::getParam('domainVerification')) {
+            $response
+                ->addHeader('X-Fallback-Cookies', \json_encode([Auth::$cookieName => Auth::encodeSession($user->getId(), $secret)]))
+            ;
+        }
+
+        $response
+            ->addCookie(Auth::$cookieName . '_legacy', Auth::encodeSession($user->getId(), $secret), (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
+            ->addCookie(Auth::$cookieName, Auth::encodeSession($user->getId(), $secret), (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
+        ;
+
        $response->dynamic(
            $membership
-                ->setAttribute('teamName', $team->getAttribute('name'))
-                ->setAttribute('userName', $user->getAttribute('name'))
-                ->setAttribute('userEmail', $user->getAttribute('email')),
+            ->setAttribute('teamName', $team->getAttribute('name'))
+            ->setAttribute('userName', $user->getAttribute('name'))
+            ->setAttribute('userEmail', $user->getAttribute('email')),
            Response::MODEL_MEMBERSHIP
        );
    });
@@ -1297,20 +1152,12 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
    ->label('scope', 'teams.write')
    ->label('audits.event', 'membership.delete')
    ->label('audits.resource', 'team/{request.teamId}')
-    ->label('sdk', new Method(
-        namespace: 'teams',
-        group: 'memberships',
-        name: 'deleteMembership',
-        description: '/docs/references/teams/delete-team-membership.md',
-        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_NOCONTENT,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        contentType: ContentType::NONE
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'teams')
+    ->label('sdk.method', 'deleteMembership')
+    ->label('sdk.description', '/docs/references/teams/delete-team-membership.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
+    ->label('sdk.response.model', Response::MODEL_NONE)
    ->param('teamId', '', new UID(), 'Team ID.')
    ->param('membershipId', '', new UID(), 'Membership ID.')
    ->inject('response')
@@ -1368,19 +1215,13 @@ App::get('/v1/teams/:teamId/logs')
    ->desc('List team logs')
    ->groups(['api', 'teams'])
    ->label('scope', 'teams.read')
-    ->label('sdk', new Method(
-        namespace: 'teams',
-        group: 'logs',
-        name: 'listLogs',
-        description: '/docs/references/teams/get-team-logs.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_LOG_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'teams')
+    ->label('sdk.method', 'listLogs')
+    ->label('sdk.description', '/docs/references/teams/get-team-logs.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_LOG_LIST)
    ->param('teamId', '', new UID(), 'Team ID.')
    ->param('queries', [], new Queries([new Limit(), new Offset()]), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
    ->inject('response')
@@ -1401,15 +1242,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 = [];

@@ -1456,7 +1295,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);
    });
@@ -4,11 +4,6 @@ use Appwrite\Auth\OAuth2\Github as OAuth2Github;
 use Appwrite\Event\Build;
 use Appwrite\Event\Delete;
 use Appwrite\Extend\Exception;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\MethodType;
-use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Database\Validator\Queries\Installations;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
@@ -19,7 +14,6 @@ use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -48,31 +42,32 @@ use Utopia\VCS\Exception\RepositoryNotFound;

 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) {
+$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 $dbForConsole, Build $queueForBuilds, callable $getProjectDB, Request $request) {
    $errors = [];
-    foreach ($repositories as $resource) {
+    foreach ($repositories as $repository) {
        try {
-            $resourceType = $resource->getAttribute('resourceType');
+            $resourceType = $repository->getAttribute('resourceType');

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

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

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

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

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

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

            $latestCommentId = '';

-            if (!empty($providerPullRequestId) && $function->getAttribute('providerSilentMode', false) === false) {
-                $latestComment = Authorization::skip(fn () => $dbForPlatform->findOne('vcsComments', [
+            if (!empty($providerPullRequestId) && $resource->getAttribute('providerSilentMode', false) === false) {
+                $latestComment = Authorization::skip(fn () => $dbForConsole->findOne('vcsComments', [
                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
                    Query::equal('providerPullRequestId', [$providerPullRequestId]),
                    Query::orderDesc('$createdAt'),
@@ -118,20 +113,21 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId

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

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

                    if (!empty($latestCommentId)) {
                        $teamId = $project->getAttribute('teamId', '');

-                        $latestComment = Authorization::skip(fn () => $dbForPlatform->createDocument('vcsComments', new Document([
+                        $latestComment = Authorization::skip(fn () => $dbForConsole->createDocument('vcsComments', new Document([
                            '$id' => ID::unique(),
                            '$permissions' => [
                                Permission::read(Role::team(ID::custom($teamId))),
@@ -152,7 +148,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                    }
                }
            } elseif (!empty($providerBranch)) {
-                $latestComments = Authorization::skip(fn () => $dbForPlatform->find('vcsComments', [
+                $latestComments = Authorization::skip(fn () => $dbForConsole->find('vcsComments', [
                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
                    Query::equal('providerBranch', [$providerBranch]),
                    Query::orderDesc('$createdAt'),
@@ -162,19 +158,19 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                    $latestCommentId = $comment->getAttribute('providerCommentId', '');
                    $comment = new Comment();
                    $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
-                    $comment->addBuild($project, $function, $commentStatus, $deploymentId, $action);
+                    $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '', '');

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

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

-                $providerRepositoryId = $resource->getAttribute('providerRepositoryId');
+                $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
                try {
                    $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
                    if (empty($repositoryName)) {
@@ -201,11 +197,14 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                    Permission::update(Role::any()),
                    Permission::delete(Role::any()),
                ],
-                'resourceId' => $functionId,
-                'resourceInternalId' => $functionInternalId,
-                'resourceType' => 'functions',
-                'entrypoint' => $function->getAttribute('entrypoint'),
-                'commands' => $function->getAttribute('commands'),
+                'resourceId' => $resourceId,
+                'resourceInternalId' => $resourceInternalId,
+                'resourceType' => $resourceCollection,
+                'entrypoint' => $resource->getAttribute('entrypoint', ''),
+                'commands' => $resource->getAttribute('commands', ''),
+                'installCommand' => $resource->getAttribute('installCommand', ''),
+                'buildCommand' => $resource->getAttribute('buildCommand', ''),
+                'outputDirectory' => $resource->getAttribute('outputDirectory', ''),
                'type' => 'vcs',
                'installationId' => $installationId,
                'installationInternalId' => $installationInternalId,
@@ -223,17 +222,40 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                'providerCommitUrl' => $providerCommitUrl,
                'providerCommentId' => \strval($latestCommentId),
                'providerBranch' => $providerBranch,
-                'search' => implode(' ', [$deploymentId, $function->getAttribute('entrypoint')]),
+                'search' => implode(' ', [$deploymentId, $resource->getAttribute('entrypoint', '')]),
                'activate' => $activate,
            ]));

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

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

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

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

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

            //TODO: Add event?
        } catch (Throwable $e) {
@@ -270,26 +292,18 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
 };

 App::get('/v1/vcs/github/authorize')
-    ->desc('Create GitHub app installation')
+    ->desc('Install GitHub app')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.read')
+    ->label('sdk.namespace', 'vcs')
    ->label('error', __DIR__ . '/../../views/general/error.phtml')
-    ->label('sdk', new Method(
-        namespace: 'vcs',
-        group: 'installations',
-        name: 'createGitHubInstallation',
-        description: '/docs/references/vcs/create-github-installation.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_MOVED_PERMANENTLY,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        contentType: ContentType::HTML,
-        type: MethodType::WEBAUTH,
-        hide: true,
-    ))
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.method', 'createGitHubInstallation')
+    ->label('sdk.description', '')
+    ->label('sdk.response.code', Response::STATUS_CODE_MOVED_PERMANENTLY)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_HTML)
+    ->label('sdk.methodType', 'webAuth')
+    ->label('sdk.hide', true)
    ->param('success', '', fn ($clients) => new Host($clients), 'URL to redirect back to console after a successful installation attempt.', true, ['clients'])
    ->param('failure', '', fn ($clients) => new Host($clients), 'URL to redirect back to console after a failed installation attempt.', true, ['clients'])
    ->inject('request')
@@ -320,7 +334,7 @@ App::get('/v1/vcs/github/authorize')
    });

 App::get('/v1/vcs/github/callback')
-    ->desc('Get installation and authorization from GitHub app')
+    ->desc('Capture installation and authorization from GitHub app')
    ->groups(['api', 'vcs'])
    ->label('scope', 'public')
    ->label('error', __DIR__ . '/../../views/general/error.phtml')
@@ -333,8 +347,8 @@ App::get('/v1/vcs/github/callback')
    ->inject('project')
    ->inject('request')
    ->inject('response')
-    ->inject('dbForPlatform')
-    ->action(function (string $providerInstallationId, string $setupAction, string $state, string $code, GitHub $github, Document $user, Document $project, Request $request, Response $response, Database $dbForPlatform) {
+    ->inject('dbForConsole')
+    ->action(function (string $providerInstallationId, string $setupAction, string $state, string $code, GitHub $github, Document $user, Document $project, Request $request, Response $response, Database $dbForConsole) {
        if (empty($state)) {
            $error = 'Installation requests from organisation members for the Appwrite GitHub App are currently unsupported. To proceed with the installation, login to the Appwrite Console and install the GitHub App.';
            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $error);
@@ -353,7 +367,7 @@ App::get('/v1/vcs/github/callback')
        $redirectSuccess = $state['success'] ?? '';
        $redirectFailure = $state['failure'] ?? '';

-        $project = $dbForPlatform->getDocument('projects', $projectId);
+        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
            $error = 'Project with the ID from state could not be found.';
@@ -369,6 +383,53 @@ App::get('/v1/vcs/github/callback')
            throw new Exception(Exception::PROJECT_NOT_FOUND, $error);
        }

+        $personalSlug = '';
+
+        // OAuth Authroization
+        if (!empty($code)) {
+            $oauth2 = new OAuth2Github(System::getEnv('_APP_VCS_GITHUB_CLIENT_ID', ''), System::getEnv('_APP_VCS_GITHUB_CLIENT_SECRET', ''), "");
+            $accessToken = $oauth2->getAccessToken($code) ?? '';
+            $refreshToken = $oauth2->getRefreshToken($code) ?? '';
+            $accessTokenExpiry = $oauth2->getAccessTokenExpiry($code) ?? '';
+            $personalSlug = $oauth2->getUserSlug($accessToken) ?? '';
+            $email = $oauth2->getUserEmail($accessToken);
+            $oauth2ID = $oauth2->getUserID($accessToken);
+
+            // Makes sure this email is not already used in another identity
+            $identity = $dbForConsole->findOne('identities', [
+                Query::equal('providerEmail', [$email]),
+            ]);
+            if (!$identity->isEmpty()) {
+                if ($identity->getAttribute('userInternalId', '') !== $user->getInternalId()) {
+                    throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
+                }
+
+                $identity = $identity
+                    ->setAttribute('providerAccessToken', $accessToken)
+                    ->setAttribute('providerRefreshToken', $refreshToken)
+                    ->setAttribute('providerAccessTokenExpiry', DateTime::addSeconds(new \DateTime(), (int)$accessTokenExpiry));
+
+                $dbForConsole->updateDocument('identities', $identity->getId(), $identity);
+            } else {
+                $identity = $dbForConsole->createDocument('identities', new Document([
+                    '$id' => ID::unique(),
+                    '$permissions' => [
+                        Permission::read(Role::any()),
+                        Permission::update(Role::user($user->getId())),
+                        Permission::delete(Role::user($user->getId())),
+                    ],
+                    'userInternalId' => $user->getInternalId(),
+                    'userId' => $user->getId(),
+                    'provider' => 'github',
+                    'providerUid' => $oauth2ID,
+                    'providerEmail' => $email,
+                    'providerAccessToken' => $accessToken,
+                    'providerRefreshToken' => $refreshToken,
+                    'providerAccessTokenExpiry' => DateTime::addSeconds(new \DateTime(), (int)$accessTokenExpiry),
+                ]));
+            }
+        }
+
        // Create / Update installation
        if (!empty($providerInstallationId)) {
            $privateKey = System::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
@@ -378,27 +439,11 @@ App::get('/v1/vcs/github/callback')

            $projectInternalId = $project->getInternalId();

-            $installation = $dbForPlatform->findOne('installations', [
+            $installation = $dbForConsole->findOne('installations', [
                Query::equal('providerInstallationId', [$providerInstallationId]),
                Query::equal('projectInternalId', [$projectInternalId])
            ]);

-            $personal = false;
-            $refreshToken = null;
-            $accessToken = null;
-            $accessTokenExpiry = null;
-
-            if (!empty($code)) {
-                $oauth2 = new OAuth2Github(System::getEnv('_APP_VCS_GITHUB_CLIENT_ID', ''), System::getEnv('_APP_VCS_GITHUB_CLIENT_SECRET', ''), "");
-
-                $accessToken = $oauth2->getAccessToken($code) ?? '';
-                $refreshToken = $oauth2->getRefreshToken($code) ?? '';
-                $accessTokenExpiry = DateTime::addSeconds(new \DateTime(), \intval($oauth2->getAccessTokenExpiry($code)));
-
-                $personalSlug = $oauth2->getUserSlug($accessToken) ?? '';
-                $personal = $personalSlug === $owner;
-            }
-
            if ($installation->isEmpty()) {
                $teamId = $project->getAttribute('teamId', '');

@@ -416,21 +461,15 @@ App::get('/v1/vcs/github/callback')
                    'projectInternalId' => $projectInternalId,
                    'provider' => 'github',
                    'organization' => $owner,
-                    'personal' => $personal,
-                    'personalRefreshToken' => $refreshToken,
-                    'personalAccessToken' => $accessToken,
-                    'personalAccessTokenExpiry' => $accessTokenExpiry,
+                    'personal' => $personalSlug === $owner
                ]);

-                $installation = $dbForPlatform->createDocument('installations', $installation);
+                $installation = $dbForConsole->createDocument('installations', $installation);
            } else {
                $installation = $installation
                    ->setAttribute('organization', $owner)
-                    ->setAttribute('personal', $personal)
-                    ->setAttribute('personalRefreshToken', $refreshToken)
-                    ->setAttribute('personalAccessToken', $accessToken)
-                    ->setAttribute('personalAccessTokenExpiry', $accessTokenExpiry);
-                $installation = $dbForPlatform->updateDocument('installations', $installation->getId(), $installation);
+                    ->setAttribute('personal', $personalSlug === $owner);
+                $installation = $dbForConsole->updateDocument('installations', $installation->getId(), $installation);
            }
        } else {
            $error = 'Installation of the Appwrite GitHub App on organization accounts is restricted to organization owners. As a member of the organization, you do not have the necessary permissions to install this GitHub App. Please contact the organization owner to create the installation from the Appwrite console.';
@@ -456,28 +495,22 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
    ->desc('Get files and directories of a VCS repository')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.read')
-    ->label('sdk', new Method(
-        namespace: 'vcs',
-        group: 'repositories',
-        name: 'getRepositoryContents',
-        description: '/docs/references/vcs/get-repository-contents.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_VCS_CONTENT_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.namespace', 'vcs')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.method', 'getRepositoryContents')
+    ->label('sdk.description', '')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_VCS_CONTENT_LIST)
    ->param('installationId', '', new Text(256), 'Installation Id')
    ->param('providerRepositoryId', '', new Text(256), 'Repository Id')
    ->param('providerRootDirectory', '', new Text(256, 0), 'Path to get contents of nested directory', true)
    ->inject('gitHub')
    ->inject('response')
    ->inject('project')
-    ->inject('dbForPlatform')
-    ->action(function (string $installationId, string $providerRepositoryId, string $providerRootDirectory, GitHub $github, Response $response, Document $project, Database $dbForPlatform) {
-        $installation = $dbForPlatform->getDocument('installations', $installationId);
+    ->inject('dbForConsole')
+    ->action(function (string $installationId, string $providerRepositoryId, string $providerRootDirectory, GitHub $github, Response $response, Document $project, Database $dbForConsole) {
+        $installation = $dbForConsole->getDocument('installations', $installationId);

        if ($installation->isEmpty()) {
            throw new Exception(Exception::INSTALLATION_NOT_FOUND);
@@ -520,31 +553,25 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
    });

 App::post('/v1/vcs/github/installations/:installationId/providerRepositories/:providerRepositoryId/detection')
-    ->desc('Create runtime settings detection')
+    ->desc('Detect runtime settings from source code')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.write')
-    ->label('sdk', new Method(
-        namespace: 'vcs',
-        group: 'repositories',
-        name: 'createRepositoryDetection',
-        description: '/docs/references/vcs/create-repository-detection.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_DETECTION,
-            )
-        ]
-    ))
+    ->label('sdk.namespace', 'vcs')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.method', 'createRepositoryDetection')
+    ->label('sdk.description', '')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_DETECTION)
    ->param('installationId', '', new Text(256), 'Installation Id')
    ->param('providerRepositoryId', '', new Text(256), 'Repository Id')
    ->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 $providerRootDirectory, GitHub $github, Response $response, Document $project, Database $dbForPlatform) {
-        $installation = $dbForPlatform->getDocument('installations', $installationId);
+    ->inject('dbForConsole')
+    ->action(function (string $installationId, string $providerRepositoryId, string $providerRootDirectory, GitHub $github, Response $response, Document $project, Database $dbForConsole) {
+        $installation = $dbForConsole->getDocument('installations', $installationId);

        if ($installation->isEmpty()) {
            throw new Exception(Exception::INSTALLATION_NOT_FOUND);
@@ -601,31 +628,25 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
    ->desc('List repositories')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.read')
-    ->label('sdk', new Method(
-        namespace: 'vcs',
-        group: 'repositories',
-        name: 'listRepositories',
-        description: '/docs/references/vcs/list-repositories.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_PROVIDER_REPOSITORY_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.namespace', 'vcs')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.method', 'listRepositories')
+    ->label('sdk.description', '')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_PROVIDER_REPOSITORY_LIST)
    ->param('installationId', '', new Text(256), 'Installation Id')
    ->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 $search, GitHub $github, Response $response, Document $project, Database $dbForPlatform) {
+    ->inject('dbForConsole')
+    ->action(function (string $installationId, string $search, GitHub $github, Response $response, Document $project, Database $dbForConsole) {
        if (empty($search)) {
            $search = "";
        }

-        $installation = $dbForPlatform->getDocument('installations', $installationId);
+        $installation = $dbForConsole->getDocument('installations', $installationId);

        if ($installation->isEmpty()) {
            throw new Exception(Exception::INSTALLATION_NOT_FOUND);
@@ -702,19 +723,13 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
    ->desc('Create repository')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.write')
-    ->label('sdk', new Method(
-        namespace: 'vcs',
-        group: 'repositories',
-        name: 'createRepository',
-        description: '/docs/references/vcs/create-repository.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_PROVIDER_REPOSITORY,
-            )
-        ]
-    ))
+    ->label('sdk.namespace', 'vcs')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.method', 'createRepository')
+    ->label('sdk.description', '')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_PROVIDER_REPOSITORY)
    ->param('installationId', '', new Text(256), 'Installation Id')
    ->param('name', '', new Text(256), 'Repository name (slug)')
    ->param('private', '', new Boolean(false), 'Mark repository public or private')
@@ -722,9 +737,9 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
    ->inject('user')
    ->inject('response')
    ->inject('project')
-    ->inject('dbForPlatform')
-    ->action(function (string $installationId, string $name, bool $private, GitHub $github, Document $user, Response $response, Document $project, Database $dbForPlatform) {
-        $installation = $dbForPlatform->getDocument('installations', $installationId);
+    ->inject('dbForConsole')
+    ->action(function (string $installationId, string $name, bool $private, GitHub $github, Document $user, Response $response, Document $project, Database $dbForConsole) {
+        $installation = $dbForConsole->getDocument('installations', $installationId);

        if ($installation->isEmpty()) {
            throw new Exception(Exception::INSTALLATION_NOT_FOUND);
@@ -733,24 +748,18 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
        if ($installation->getAttribute('personal', false) === true) {
            $oauth2 = new OAuth2Github(System::getEnv('_APP_VCS_GITHUB_CLIENT_ID', ''), System::getEnv('_APP_VCS_GITHUB_CLIENT_SECRET', ''), "");

-            $accessToken = $installation->getAttribute('personalAccessToken');
-            $refreshToken = $installation->getAttribute('personalRefreshToken');
-            $accessTokenExpiry = $installation->getAttribute('personalAccessTokenExpiry');
-
-            if (empty($accessToken) || empty($refreshToken) || empty($accessTokenExpiry)) {
-                $identity = $dbForPlatform->findOne('identities', [
-                    Query::equal('provider', ['github']),
-                    Query::equal('userInternalId', [$user->getInternalId()]),
-                ]);
-                if ($identity->isEmpty()) {
-                    throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
-                }
-
-                $accessToken = $accessToken ?? $identity->getAttribute('providerAccessToken');
-                $refreshToken = $refreshToken ?? $identity->getAttribute('providerRefreshToken');
-                $accessTokenExpiry = $accessTokenExpiry ?? $identity->getAttribute('providerAccessTokenExpiry');
+            $identity = $dbForConsole->findOne('identities', [
+                Query::equal('provider', ['github']),
+                Query::equal('userInternalId', [$user->getInternalId()]),
+            ]);
+            if ($identity->isEmpty()) {
+                throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
            }

+            $accessToken = $identity->getAttribute('providerAccessToken');
+            $refreshToken = $identity->getAttribute('providerRefreshToken');
+            $accessTokenExpiry = $identity->getAttribute('providerAccessTokenExpiry');
+
            $isExpired = new \DateTime($accessTokenExpiry) < new \DateTime('now');
            if ($isExpired) {
                $oauth2->refreshTokens($refreshToken);
@@ -764,12 +773,12 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
                    throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED, "Another request is currently refreshing OAuth token. Please try again.");
                }

-                $installation = $installation
-                    ->setAttribute('personalAccessToken', $accessToken)
-                    ->setAttribute('personalRefreshToken', $refreshToken)
-                    ->setAttribute('personalAccessTokenExpiry', DateTime::addSeconds(new \DateTime(), (int)$oauth2->getAccessTokenExpiry('')));
+                $identity = $identity
+                    ->setAttribute('providerAccessToken', $accessToken)
+                    ->setAttribute('providerRefreshToken', $refreshToken)
+                    ->setAttribute('providerAccessTokenExpiry', DateTime::addSeconds(new \DateTime(), (int)$oauth2->getAccessTokenExpiry('')));

-                $dbForPlatform->updateDocument('installations', $installation->getId(), $installation);
+                $dbForConsole->updateDocument('identities', $identity->getId(), $identity);
            }

            try {
@@ -815,27 +824,21 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
    ->desc('Get repository')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.read')
-    ->label('sdk', new Method(
-        namespace: 'vcs',
-        group: 'repositories',
-        name: 'getRepository',
-        description: '/docs/references/vcs/get-repository.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_PROVIDER_REPOSITORY,
-            )
-        ]
-    ))
+    ->label('sdk.namespace', 'vcs')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.method', 'getRepository')
+    ->label('sdk.description', '')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_PROVIDER_REPOSITORY)
    ->param('installationId', '', new Text(256), 'Installation Id')
    ->param('providerRepositoryId', '', new Text(256), 'Repository Id')
    ->inject('gitHub')
    ->inject('response')
    ->inject('project')
-    ->inject('dbForPlatform')
-    ->action(function (string $installationId, string $providerRepositoryId, GitHub $github, Response $response, Document $project, Database $dbForPlatform) {
-        $installation = $dbForPlatform->getDocument('installations', $installationId);
+    ->inject('dbForConsole')
+    ->action(function (string $installationId, string $providerRepositoryId, GitHub $github, Response $response, Document $project, Database $dbForConsole) {
+        $installation = $dbForConsole->getDocument('installations', $installationId);

        if ($installation->isEmpty()) {
            throw new Exception(Exception::INSTALLATION_NOT_FOUND);
@@ -870,27 +873,21 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
    ->desc('List repository branches')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.read')
-    ->label('sdk', new Method(
-        namespace: 'vcs',
-        group: 'repositories',
-        name: 'listRepositoryBranches',
-        description: '/docs/references/vcs/list-repository-branches.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_BRANCH_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.namespace', 'vcs')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.method', 'listRepositoryBranches')
+    ->label('sdk.description', '')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_BRANCH_LIST)
    ->param('installationId', '', new Text(256), 'Installation Id')
    ->param('providerRepositoryId', '', new Text(256), 'Repository Id')
    ->inject('gitHub')
    ->inject('response')
    ->inject('project')
-    ->inject('dbForPlatform')
-    ->action(function (string $installationId, string $providerRepositoryId, GitHub $github, Response $response, Document $project, Database $dbForPlatform) {
-        $installation = $dbForPlatform->getDocument('installations', $installationId);
+    ->inject('dbForConsole')
+    ->action(function (string $installationId, string $providerRepositoryId, GitHub $github, Response $response, Document $project, Database $dbForConsole) {
+        $installation = $dbForConsole->getDocument('installations', $installationId);

        if ($installation->isEmpty()) {
            throw new Exception(Exception::INSTALLATION_NOT_FOUND);
@@ -928,11 +925,11 @@ App::post('/v1/vcs/github/events')
    ->inject('gitHub')
    ->inject('request')
    ->inject('response')
-    ->inject('dbForPlatform')
+    ->inject('dbForConsole')
    ->inject('getProjectDB')
    ->inject('queueForBuilds')
    ->action(
-        function (GitHub $github, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Build $queueForBuilds) use ($createGitDeployments) {
+        function (GitHub $github, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Build $queueForBuilds) use ($createGitDeployments) {
            $payload = $request->getRawPayload();
            $signatureRemote = $request->getHeader('x-hub-signature-256', '');
            $signatureLocal = System::getEnv('_APP_VCS_GITHUB_WEBHOOK_SECRET', '');
@@ -965,37 +962,37 @@ App::post('/v1/vcs/github/events')

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

-                //find functionId from functions table
-                $repositories = Authorization::skip(fn () => $dbForPlatform->find('repositories', [
+                //find resourceId from relevant resources table
+                $repositories = Authorization::skip(fn () => $dbForConsole->find('repositories', [
                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
                    Query::limit(100),
                ]));

                // create new deployment only on push and not when branch is created
                if (!$providerBranchCreated) {
-                    $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, '', false, $dbForPlatform, $queueForBuilds, $getProjectDB, $request);
+                    $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, '', false, $dbForConsole, $queueForBuilds, $getProjectDB, $request);
                }
            } elseif ($event == $github::EVENT_INSTALLATION) {
                if ($parsedPayload["action"] == "deleted") {
-                    // TODO: Use worker for this job instead (update function as well)
+                    // TODO: Use worker for this job instead (update function/site as well)
                    $providerInstallationId = $parsedPayload["installationId"];

-                    $installations = $dbForPlatform->find('installations', [
+                    $installations = $dbForConsole->find('installations', [
                        Query::equal('providerInstallationId', [$providerInstallationId]),
                        Query::limit(1000)
                    ]);

                    foreach ($installations as $installation) {
-                        $repositories = Authorization::skip(fn () => $dbForPlatform->find('repositories', [
+                        $repositories = Authorization::skip(fn () => $dbForConsole->find('repositories', [
                            Query::equal('installationInternalId', [$installation->getInternalId()]),
                            Query::limit(1000)
                        ]));

                        foreach ($repositories as $repository) {
-                            Authorization::skip(fn () => $dbForPlatform->deleteDocument('repositories', $repository->getId()));
+                            Authorization::skip(fn () => $dbForConsole->deleteDocument('repositories', $repository->getId()));
                        }

-                        $dbForPlatform->deleteDocument('installations', $installation->getId());
+                        $dbForConsole->deleteDocument('installations', $installation->getId());
                    }
                }
            } elseif ($event == $github::EVENT_PULL_REQUEST) {
@@ -1024,12 +1021,12 @@ App::post('/v1/vcs/github/events')
                    $providerCommitAuthor = $commitDetails["commitAuthor"] ?? '';
                    $providerCommitMessage = $commitDetails["commitMessage"] ?? '';

-                    $repositories = Authorization::skip(fn () => $dbForPlatform->find('repositories', [
+                    $repositories = Authorization::skip(fn () => $dbForConsole->find('repositories', [
                        Query::equal('providerRepositoryId', [$providerRepositoryId]),
                        Query::orderDesc('$createdAt')
                    ]));

-                    $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, $providerPullRequestId, $external, $dbForPlatform, $queueForBuilds, $getProjectDB, $request);
+                    $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, $providerPullRequestId, $external, $dbForConsole, $queueForBuilds, $getProjectDB, $request);
                } elseif ($parsedPayload["action"] == "closed") {
                    // Allowed external contributions cleanup

@@ -1038,7 +1035,7 @@ App::post('/v1/vcs/github/events')
                    $external = $parsedPayload["external"] ?? true;

                    if ($external) {
-                        $repositories = Authorization::skip(fn () => $dbForPlatform->find('repositories', [
+                        $repositories = Authorization::skip(fn () => $dbForConsole->find('repositories', [
                            Query::equal('providerRepositoryId', [$providerRepositoryId]),
                            Query::orderDesc('$createdAt')
                        ]));
@@ -1049,7 +1046,7 @@ App::post('/v1/vcs/github/events')
                            if (\in_array($providerPullRequestId, $providerPullRequestIds)) {
                                $providerPullRequestIds = \array_diff($providerPullRequestIds, [$providerPullRequestId]);
                                $repository = $repository->setAttribute('providerPullRequestIds', $providerPullRequestIds);
-                                $repository = Authorization::skip(fn () => $dbForPlatform->updateDocument('repositories', $repository->getId(), $repository));
+                                $repository = Authorization::skip(fn () => $dbForConsole->updateDocument('repositories', $repository->getId(), $repository));
                            }
                        }
                    }
@@ -1064,26 +1061,20 @@ App::get('/v1/vcs/installations')
    ->desc('List installations')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.read')
-    ->label('sdk', new Method(
-        namespace: 'vcs',
-        group: 'installations',
-        name: 'listInstallations',
-        description: '/docs/references/vcs/list-installations.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_INSTALLATION_LIST,
-            )
-        ]
-    ))
+    ->label('sdk.namespace', 'vcs')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.method', 'listInstallations')
+    ->label('sdk.description', '/docs/references/vcs/list-installations.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_INSTALLATION_LIST)
    ->param('queries', [], new Installations(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Installations::ALLOWED_ATTRIBUTES), true)
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('response')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('dbForPlatform')
-    ->action(function (array $queries, string $search, Response $response, Document $project, Database $dbForProject, Database $dbForPlatform) {
+    ->inject('dbForConsole')
+    ->action(function (array $queries, string $search, Response $response, Document $project, Database $dbForProject, Database $dbForConsole) {
        try {
            $queries = Query::parseQueries($queries);
        } catch (QueryException $e) {
@@ -1112,7 +1103,7 @@ App::get('/v1/vcs/installations')
            }

            $installationId = $cursor->getValue();
-            $cursorDocument = $dbForPlatform->getDocument('installations', $installationId);
+            $cursorDocument = $dbForConsole->getDocument('installations', $installationId);

            if ($cursorDocument->isEmpty()) {
                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Installation '{$installationId}' for the 'cursor' value not found.");
@@ -1122,12 +1113,9 @@ App::get('/v1/vcs/installations')
        }

        $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $results = $dbForPlatform->find('installations', $queries);
-            $total = $dbForPlatform->count('installations', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
-        }
+
+        $results = $dbForConsole->find('installations', $queries);
+        $total = $dbForConsole->count('installations', $filterQueries, APP_LIMIT_COUNT);

        $response->dynamic(new Document([
            'installations' => $results,
@@ -1139,25 +1127,19 @@ App::get('/v1/vcs/installations/:installationId')
    ->desc('Get installation')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.read')
-    ->label('sdk', new Method(
-        namespace: 'vcs',
-        group: 'installations',
-        name: 'getInstallation',
-        description: '/docs/references/vcs/get-installation.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_INSTALLATION,
-            )
-        ]
-    ))
+    ->label('sdk.namespace', 'vcs')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.method', 'getInstallation')
+    ->label('sdk.description', '/docs/references/vcs/get-installation.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_INSTALLATION)
    ->param('installationId', '', new Text(256), 'Installation Id')
    ->inject('response')
    ->inject('project')
-    ->inject('dbForPlatform')
-    ->action(function (string $installationId, Response $response, Document $project, Database $dbForPlatform) {
-        $installation = $dbForPlatform->getDocument('installations', $installationId);
+    ->inject('dbForConsole')
+    ->action(function (string $installationId, Response $response, Document $project, Database $dbForConsole) {
+        $installation = $dbForConsole->getDocument('installations', $installationId);

        if ($installation === false || $installation->isEmpty()) {
            throw new Exception(Exception::INSTALLATION_NOT_FOUND);
@@ -1174,33 +1156,25 @@ App::delete('/v1/vcs/installations/:installationId')
    ->desc('Delete installation')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.write')
-    ->label('sdk', new Method(
-        namespace: 'vcs',
-        group: 'installations',
-        name: 'deleteInstallation',
-        description: '/docs/references/vcs/delete-installation.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_NOCONTENT,
-                model: Response::MODEL_NONE,
-            )
-        ],
-        contentType: ContentType::NONE
-    ))
+    ->label('sdk.namespace', 'vcs')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.method', 'deleteInstallation')
+    ->label('sdk.description', '/docs/references/vcs/delete-installation.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
+    ->label('sdk.response.model', Response::MODEL_NONE)
    ->param('installationId', '', new Text(256), 'Installation Id')
    ->inject('response')
    ->inject('project')
-    ->inject('dbForPlatform')
+    ->inject('dbForConsole')
    ->inject('queueForDeletes')
-    ->action(function (string $installationId, Response $response, Document $project, Database $dbForPlatform, Delete $queueForDeletes) {
-        $installation = $dbForPlatform->getDocument('installations', $installationId);
+    ->action(function (string $installationId, Response $response, Document $project, Database $dbForConsole, Delete $queueForDeletes) {
+        $installation = $dbForConsole->getDocument('installations', $installationId);

        if ($installation->isEmpty()) {
            throw new Exception(Exception::INSTALLATION_NOT_FOUND);
        }

-        if (!$dbForPlatform->deleteDocument('installations', $installation->getId())) {
+        if (!$dbForConsole->deleteDocument('installations', $installation->getId())) {
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove installation from DB');
        }

@@ -1212,22 +1186,15 @@ App::delete('/v1/vcs/installations/:installationId')
    });

 App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositoryId')
-    ->desc('Update external deployment (authorize)')
+    ->desc('Authorize external deployment')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.write')
-    ->label('sdk', new Method(
-        namespace: 'vcs',
-        group: 'repositories',
-        name: 'updateExternalDeployments',
-        description: '/docs/references/vcs/update-external-deployments.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_NOCONTENT,
-                model: Response::MODEL_NONE,
-            )
-        ]
-    ))
+    ->label('sdk.namespace', 'vcs')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.method', 'updateExternalDeployments')
+    ->label('sdk.description', '')
+    ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
+    ->label('sdk.response.model', Response::MODEL_NONE)
    ->param('installationId', '', new Text(256), 'Installation Id')
    ->param('repositoryId', '', new Text(256), 'VCS Repository Id')
    ->param('providerPullRequestId', '', new Text(256), 'GitHub Pull Request Id')
@@ -1235,17 +1202,17 @@ App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositor
    ->inject('request')
    ->inject('response')
    ->inject('project')
-    ->inject('dbForPlatform')
+    ->inject('dbForConsole')
    ->inject('getProjectDB')
    ->inject('queueForBuilds')
-    ->action(function (string $installationId, string $repositoryId, string $providerPullRequestId, GitHub $github, Request $request, Response $response, Document $project, Database $dbForPlatform, callable $getProjectDB, Build $queueForBuilds) use ($createGitDeployments) {
-        $installation = $dbForPlatform->getDocument('installations', $installationId);
+    ->action(function (string $installationId, string $repositoryId, string $providerPullRequestId, GitHub $github, Request $request, Response $response, Document $project, Database $dbForConsole, callable $getProjectDB, Build $queueForBuilds) use ($createGitDeployments) {
+        $installation = $dbForConsole->getDocument('installations', $installationId);

        if ($installation->isEmpty()) {
            throw new Exception(Exception::INSTALLATION_NOT_FOUND);
        }

-        $repository = Authorization::skip(fn () => $dbForPlatform->getDocument('repositories', $repositoryId, [
+        $repository = Authorization::skip(fn () => $dbForConsole->getDocument('repositories', $repositoryId, [
            Query::equal('projectInternalId', [$project->getInternalId()])
        ]));

@@ -1262,7 +1229,7 @@ App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositor

        // TODO: Delete from array when PR is closed

-        $repository = Authorization::skip(fn () => $dbForPlatform->updateDocument('repositories', $repository->getId(), $repository));
+        $repository = Authorization::skip(fn () => $dbForConsole->updateDocument('repositories', $repository->getId(), $repository));

        $privateKey = System::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
        $githubAppId = System::getEnv('_APP_VCS_GITHUB_APP_ID');
@@ -1286,7 +1253,7 @@ App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositor
        $providerBranch = \explode(':', $pullRequestResponse['head']['label'])[1] ?? '';
        $providerCommitHash = $pullRequestResponse['head']['sha'] ?? '';

-        $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerCommitHash, $providerPullRequestId, true, $dbForPlatform, $queueForBuilds, $getProjectDB, $request);
+        $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerCommitHash, $providerPullRequestId, true, $dbForConsole, $queueForBuilds, $getProjectDB, $request);

        $response->noContent();
    });
@@ -7,13 +7,10 @@ use Appwrite\Auth\Auth;
 use Appwrite\Event\Certificate;
 use Appwrite\Event\Event;
 use Appwrite\Event\Func;
-use Appwrite\Event\StatsUsage;
+use Appwrite\Event\Usage;
 use Appwrite\Extend\Exception as AppwriteException;
 use Appwrite\Network\Validator\Origin;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Platform\Appwrite;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Request\Filters\V16 as RequestV16;
 use Appwrite\Utopia\Request\Filters\V17 as RequestV17;
@@ -33,7 +30,6 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Helpers\ID;
-use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Domains\Domain;
 use Utopia\DSN\DSN;
@@ -42,6 +38,7 @@ use Utopia\Logger\Adapter\Sentry;
 use Utopia\Logger\Log;
 use Utopia\Logger\Log\User;
 use Utopia\Logger\Logger;
+use Utopia\Platform\Service;
 use Utopia\System\System;
 use Utopia\Validator\Hostname;
 use Utopia\Validator\Text;
@@ -50,68 +47,37 @@ 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, Executor $executor, Reader $geodb, callable $isResourceBlocked, string $previewHostname)
+function router(App $utopia, Database $dbForConsole, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked)
 {
    $utopia->getRoute()?->label('error', __DIR__ . '/../views/general/error.phtml');

    $host = $request->getHostname() ?? '';
-    if (!empty($previewHostname)) {
-        $host = $previewHostname;
-    }

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

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

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

        if (System::getEnv('_APP_OPTIONS_ROUTER_PROTECTION', 'disabled') === 'enabled') {
-            if ($host !== 'localhost' && $host !== APP_HOSTNAME_INTERNAL && $host !== System::getEnv('_APP_CONSOLE_DOMAIN', '')) {
+            if ($host !== 'localhost' && $host !== APP_HOSTNAME_INTERNAL) { // localhost allowed for proxy, APP_HOSTNAME_INTERNAL allowed for migrations
                throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'Router protection does not allow accessing Appwrite over this domain. Please add it as custom domain to your project or disable _APP_OPTIONS_ROUTER_PROTECTION environment variable.');
            }
        }

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

-    $projectId = $route->getAttribute('projectId');
-    $project = Authorization::skip(
-        fn () => $dbForPlatform->getDocument('projects', $projectId)
-    );
-
-    if (!$project->isEmpty() && $project->getId() !== 'console') {
-        $accessedAt = $project->getAttribute('accessedAt', '');
-        if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $accessedAt) {
-            $project->setAttribute('accessedAt', DateTime::now());
-            Authorization::skip(fn () => $dbForPlatform->updateDocument('projects', $project->getId(), $project));
-        }
-    }
-
+    $projectId = $rule->getAttribute('projectId');
+    $project = Authorization::skip(fn () => $dbForConsole->getDocument('projects', $projectId));
    if (array_key_exists('proxy', $project->getAttribute('services', []))) {
        $status = $project->getAttribute('services', [])['proxy'];
        if (!$status) {
@@ -125,46 +91,29 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        return false;
    }

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

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

-        if (empty($method)) {
-            $utopia->getRoute()?->label('sdk', new Method(
-                namespace: 'functions',
-                group: 'executions',
-                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);
-        }
+        $utopia->getRoute()?->label('sdk.namespace', 'functions');
+        $utopia->getRoute()?->label('sdk.method', 'createExecution');

-        if (System::getEnv('_APP_OPTIONS_FUNCTIONS_FORCE_HTTPS', 'disabled') === 'enabled') { // Force HTTPS
+        if (System::getEnv('_APP_OPTIONS_COMPUTE_FORCE_HTTPS', 'disabled') === 'enabled') { // Force HTTPS
            if ($request->getProtocol() !== 'https') {
                if ($request->getMethod() !== Request::METHOD_GET) {
                    throw new AppwriteException(AppwriteException::GENERAL_PROTOCOL_UNSUPPORTED, 'Method unsupported over HTTP. Please use HTTPS instead.');
                }
-
                return $response->redirect('https://' . $request->getHostname() . $request->getURI());
            }
        }

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

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

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

        $requestHeaders = $request->getHeaders();

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

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

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

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

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

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

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

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

-        $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $function->getAttribute('deployment', '')));
+        $deploymentId = match($type) {
+            'function' => $resource->getAttribute('deployment', ''),
+            'site' => $resource->getAttribute('deploymentId', ''),
+            'deployment' => $subResource->getId()
+        };

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

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

-        $permissions = $function->getAttribute('execute');
+        //todo: figure out for sites/functions
+        if ($type === 'function') {
+            $permissions = $resource->getAttribute('execute');

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

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

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

        $queueForEvents
-            ->setParam('functionId', $function->getId())
+            ->setParam('functionId', $resource->getId())
            ->setParam('executionId', $execution->getId())
-            ->setContext('function', $function);
+            ->setContext('function', $resource);

        $durationStart = \microtime(true);

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

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

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

@@ -322,14 +298,14 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        // Appwrite vars
        $vars = \array_merge($vars, [
            'APPWRITE_FUNCTION_API_ENDPOINT' => $endpoint,
-            'APPWRITE_FUNCTION_ID' => $functionId,
-            'APPWRITE_FUNCTION_NAME' => $function->getAttribute('name'),
+            'APPWRITE_FUNCTION_ID' => $resourceId,
+            'APPWRITE_FUNCTION_NAME' => $resource->getAttribute('name'),
            'APPWRITE_FUNCTION_DEPLOYMENT' => $deployment->getId(),
            'APPWRITE_FUNCTION_PROJECT_ID' => $project->getId(),
            'APPWRITE_FUNCTION_RUNTIME_NAME' => $runtime['name'] ?? '',
            'APPWRITE_FUNCTION_RUNTIME_VERSION' => $runtime['version'] ?? '',
-            'APPWRITE_FUNCTION_CPUS' => $spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT,
-            'APPWRITE_FUNCTION_MEMORY' => $spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT,
+            'APPWRITE_COMPUTE_CPUS' => $spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT,
+            'APPWRITE_COMPUTE_MEMORY' => $spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT,
            'APPWRITE_VERSION' => APP_VERSION_STABLE,
            'APPWRITE_REGION' => $project->getAttribute('region'),
            'APPWRITE_DEPLOYMENT_TYPE' => $deployment->getAttribute('type', ''),
@@ -348,27 +324,40 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        ]);

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

@@ -387,7 +376,6 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            $execution->setAttribute('logs', $executionResponse['logs']);
            $execution->setAttribute('errors', $executionResponse['errors']);
            $execution->setAttribute('duration', $executionResponse['duration']);
-
        } catch (\Throwable $th) {
            $durationEnd = \microtime(true);

@@ -402,11 +390,38 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
                throw $th;
            }
        } finally {
-            $queueForFunctions
-                ->setType(Func::TYPE_ASYNC_WRITE)
-                ->setExecution($execution)
+            $fileSize = 0;
+            $file = $request->getFiles('file');
+            if (!empty($file)) {
+                $fileSize = (\is_array($file['size']) && isset($file['size'][0])) ? $file['size'][0] : $file['size'];
+            }
+
+            $queueForUsage
+                ->addMetric(METRIC_NETWORK_REQUESTS, 1)
+                ->addMetric(METRIC_NETWORK_INBOUND, $request->getSize() + $fileSize)
+                ->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize());
+            //todo: add metrics for sites
+            if ($type === 'function') {
+                $queueForUsage
+                    ->addMetric(METRIC_EXECUTIONS, 1)
+                    ->addMetric(str_replace('{functionInternalId}', $resource->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS), 1)
+                    ->addMetric(METRIC_EXECUTIONS_COMPUTE, (int)($execution->getAttribute('duration') * 1000)) // per project
+                    ->addMetric(str_replace('{functionInternalId}', $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)));
+            }
+
+            $queueForUsage
                ->setProject($project)
                ->trigger();
+
+            if ($type === 'function') {
+                $queueForFunctions
+                    ->setType(Func::TYPE_ASYNC_WRITE)
+                    ->setExecution($execution)
+                    ->setProject($project)
+                    ->trigger();
+            }
        }

        $execution->setAttribute('logs', '');
@@ -436,26 +451,6 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            ->setStatusCode($execution['responseStatusCode'] ?? 200)
            ->send($body);

-        $fileSize = 0;
-        $file = $request->getFiles('file');
-        if (!empty($file)) {
-            $fileSize = (\is_array($file['size']) && isset($file['size'][0])) ? $file['size'][0] : $file['size'];
-        }
-
-        $queueForStatsUsage
-            ->addMetric(METRIC_NETWORK_REQUESTS, 1)
-            ->addMetric(METRIC_NETWORK_INBOUND, $request->getSize() + $fileSize)
-            ->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize())
-            ->addMetric(METRIC_EXECUTIONS, 1)
-            ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS), 1)
-            ->addMetric(METRIC_EXECUTIONS_COMPUTE, (int)($execution->getAttribute('duration') * 1000)) // per project
-            ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE), (int)($execution->getAttribute('duration') * 1000)) // per function
-            ->addMetric(METRIC_EXECUTIONS_MB_SECONDS, (int)(($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT)))
-            ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS), (int)(($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT)))
-            ->setProject($project)
-            ->trigger()
-        ;
-
        return true;
    } elseif ($type === 'api') {
        $utopia->getRoute()?->label('error', '');
@@ -501,28 +496,27 @@ App::init()
    ->inject('response')
    ->inject('console')
    ->inject('project')
-    ->inject('dbForPlatform')
+    ->inject('dbForConsole')
    ->inject('getProjectDB')
    ->inject('locale')
    ->inject('localeCodes')
    ->inject('clients')
    ->inject('geodb')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('queueForEvents')
    ->inject('queueForCertificates')
    ->inject('queueForFunctions')
-    ->inject('executor')
    ->inject('isResourceBlocked')
-    ->inject('previewHostname')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, StatsUsage $queueForStatsUsage, Event $queueForEvents, Certificate $queueForCertificates, Func $queueForFunctions, Executor $executor, callable $isResourceBlocked, string $previewHostname) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForConsole, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, Usage $queueForUsage, Event $queueForEvents, Certificate $queueForCertificates, Func $queueForFunctions, callable $isResourceBlocked) {
        /*
        * Appwrite Router
        */
        $host = $request->getHostname() ?? '';
        $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, $executor, $geodb, $isResourceBlocked, $previewHostname)) {
+        if ($host !== $mainDomain) {
+            if (router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked)) {
+                $utopia->getRoute()?->label('router', 'true');
                return;
            }
        }
@@ -570,47 +564,26 @@ App::init()
                if (!empty($envDomain) && $envDomain !== 'localhost') {
                    $mainDomain = $envDomain;
                } else {
-                    // TODO: @christyjacob remove once we migrate the rules in 1.7.x
-                    if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
-                        $domainDocument = $dbForPlatform->getDocument('rules', md5($envDomain));
-                    } else {
-                        $domainDocument = $dbForPlatform->findOne('rules', [Query::orderAsc('$id')]);
-                    }
+                    $domainDocument = $dbForConsole->getDocument('rules', md5($envDomain));
                    $mainDomain = !$domainDocument->isEmpty() ? $domainDocument->getAttribute('domain') : $domain->get();
                }

                if ($mainDomain !== $domain->get()) {
                    Console::warning($domain->get() . ' is not a main domain. Skipping SSL certificate generation.');
                } else {
-                    // TODO: @christyjacob remove once we migrate the rules in 1.7.x
-                    if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
-                        $domainDocument = $dbForPlatform->getDocument('rules', md5($domain->get()));
-                    } else {
-                        $domainDocument = $dbForPlatform->findOne('rules', [
-                            Query::equal('domain', [$domain->get()])
-                        ]);
-                    }
-
-                    $owner = '';
-                    $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
-                    if (!empty($functionsDomain) && \str_ends_with($domain->get(), $functionsDomain)) {
-                        $owner = 'Appwrite';
-                    }
+                    $domainDocument = $dbForConsole->getDocument('rules', md5($domain->get()));

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

-                        $domainDocument = $dbForPlatform->createDocument('rules', $domainDocument);
+                        $domainDocument = $dbForConsole->createDocument('rules', $domainDocument);

                        Console::info('Issuing a TLS certificate for the main domain (' . $domain->get() . ') in a few seconds...');

@@ -746,25 +719,23 @@ App::options()
    ->inject('swooleRequest')
    ->inject('request')
    ->inject('response')
-    ->inject('dbForPlatform')
+    ->inject('dbForConsole')
    ->inject('getProjectDB')
    ->inject('queueForEvents')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('queueForFunctions')
-    ->inject('executor')
    ->inject('geodb')
    ->inject('isResourceBlocked')
-    ->inject('previewHostname')
-    ->inject('project')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, string $previewHostname, Document $project) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked) {
        /*
        * Appwrite Router
        */
        $host = $request->getHostname() ?? '';
        $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, $executor, $geodb, $isResourceBlocked, $previewHostname)) {
+        if ($host !== $mainDomain) {
+            if (router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked)) {
+                $utopia->getRoute()?->label('router', 'true');
                return;
            }
        }
@@ -779,16 +750,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()
@@ -799,8 +760,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);
@@ -862,10 +823,6 @@ App::error()
                break;
            case 'Utopia\Database\Exception\NotFound':
                $error = new AppwriteException(AppwriteException::COLLECTION_NOT_FOUND, $error->getMessage(), previous: $error);
-                break;
-            case 'Utopia\Database\Exception\Dependency':
-                $error = new AppwriteException(AppwriteException::INDEX_DEPENDENCY, null, previous: $error);
-                break;
        }

        $code = $error->getCode();
@@ -877,22 +834,23 @@ 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);
+                $loggingProvider = new DSN($providerConfig ?? '');
                $providerName = $loggingProvider->getScheme();

                if (!empty($providerName) && $providerName === 'sentry') {
                    $key = $loggingProvider->getPassword();
                    $projectId = $loggingProvider->getUser() ?? '';
                    $host = 'https://' . $loggingProvider->getHost();
-                    $sampleRate = $loggingProvider->getParam('sample', 0.01);

                    $adapter = new Sentry($projectId, $key, $host);
                    $logger = new Logger($adapter);
-                    $logger->setSample($sampleRate);
+                    $logger->setSample(0.04);
                    $publish = true;
                } else {
                    throw new \Exception('Invalid experimental logging provider');
@@ -902,10 +860,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');
@@ -913,17 +868,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 */
@@ -934,8 +890,6 @@ App::error()

            if (isset($user) && !$user->isEmpty()) {
                $log->setUser(new User($user->getId()));
-            } else {
-                $log->setUser(new User('guest-' . hash('sha256', $request->getIP())));
            }

            try {
@@ -946,14 +900,14 @@ App::error()
            }

            $log->setNamespace("http");
-            $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
+            $log->setServer(\gethostname());
            $log->setVersion($version);
            $log->setType(Log::TYPE_ERROR);
            $log->setMessage($error->getMessage());

            $log->addTag('database', $dsn->getHost());
            $log->addTag('method', $route->getMethod());
-            $log->addTag('url', $request->getURI());
+            $log->addTag('url', $route->getPath());
            $log->addTag('verboseType', get_class($error));
            $log->addTag('code', $error->getCode());
            $log->addTag('projectId', $project->getId());
@@ -965,14 +919,8 @@ App::error()
            $log->addExtra('trace', $error->getTraceAsString());
            $log->addExtra('roles', Authorization::getRoles());

-            $action = 'UNKNOWN_NAMESPACE.UNKNOWN.METHOD';
-            if (!empty($sdk)) {
-                /** @var Appwrite\SDK\Method $sdk */
-                $action = $sdk->getNamespace() . '.' . $sdk->getMethodName();
-            }
-
+            $action = $route->getLabel("sdk.namespace", "UNKNOWN_NAMESPACE") . '.' . $route->getLabel("sdk.method", "UNKNOWN_METHOD");
            $log->setAction($action);
-            $log->addTag('service', $action);

            $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
            $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
@@ -1067,24 +1015,24 @@ App::get('/robots.txt')
    ->inject('swooleRequest')
    ->inject('request')
    ->inject('response')
-    ->inject('dbForPlatform')
+    ->inject('dbForConsole')
    ->inject('getProjectDB')
    ->inject('queueForEvents')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('queueForFunctions')
-    ->inject('executor')
    ->inject('geodb')
    ->inject('isResourceBlocked')
-    ->inject('previewHostname')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked) {
        $host = $request->getHostname() ?? '';
        $mainDomain = System::getEnv('_APP_DOMAIN', '');

-        if (($host === $mainDomain || $host === 'localhost') && empty($previewHostname)) {
+        if ($host === $mainDomain || $host === 'localhost') {
            $template = new View(__DIR__ . '/../views/general/robots.phtml');
            $response->text($template->render(false));
        } else {
-            router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname);
+            if (router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked)) {
+                $utopia->getRoute()?->label('router', 'true');
+            }
        }
    });

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

-        if (($host === $mainDomain || $host === 'localhost') && empty($previewHostname)) {
+        if ($host === $mainDomain || $host === 'localhost') {
            $template = new View(__DIR__ . '/../views/general/humans.phtml');
            $response->text($template->render(false));
        } else {
-            router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname);
+            if (router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked)) {
+                $utopia->getRoute()?->label('router', 'true');
+            }
        }
    });

@@ -1177,10 +1125,10 @@ App::get('/v1/ping')
    ->label('event', 'projects.[projectId].ping')
    ->inject('response')
    ->inject('project')
-    ->inject('dbForPlatform')
+    ->inject('dbForConsole')
    ->inject('queueForEvents')
-    ->action(function (Response $response, Document $project, Database $dbForPlatform, Event $queueForEvents) {
-        if ($project->isEmpty() || $project->getId() === 'console') {
+    ->action(function (Response $response, Document $project, Database $dbForConsole, Event $queueForEvents) {
+        if ($project->isEmpty()) {
            throw new AppwriteException(AppwriteException::PROJECT_NOT_FOUND);
        }

@@ -1191,8 +1139,8 @@ App::get('/v1/ping')
            ->setAttribute('pingCount', $pingCount)
            ->setAttribute('pingedAt', $pingedAt);

-        Authorization::skip(function () use ($dbForPlatform, $project) {
-            $dbForPlatform->updateDocument('projects', $project->getId(), $project);
+        Authorization::skip(function () use ($dbForConsole, $project) {
+            $dbForConsole->updateDocument('projects', $project->getId(), $project);
        });

        $queueForEvents
@@ -1205,7 +1153,13 @@ App::get('/v1/ping')
 App::wildcard()
    ->groups(['api'])
    ->label('scope', 'global')
-    ->action(function () {
+    ->inject('utopia')
+    ->action(function (App $utopia) {
+        $handeledByRouter = $utopia->getRoute()?->getLabel('router', 'false');
+        if (\boolval($handeledByRouter)) {
+            return;
+        }
+
        throw new AppwriteException(AppwriteException::GENERAL_ROUTE_NOT_FOUND);
    });

@@ -1213,7 +1167,7 @@ foreach (Config::getParam('services', []) as $service) {
    include_once $service['controller'];
 }

-// 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()));
-}
+// Modules
+
+$platform = new Appwrite();
+$platform->init(Service::TYPE_HTTP);
@@ -24,7 +24,7 @@ App::get('/v1/mock/tests/general/oauth2')
    ->groups(['mock'])
    ->label('scope', 'public')
    ->label('docs', false)
-    ->label('mock', true)
+    ->label('sdk.mock', true)
    ->param('client_id', '', new Text(100), 'OAuth2 Client ID.')
    ->param('redirect_uri', '', new Host(['localhost']), 'OAuth2 Redirect URI.') // Important to deny an open redirect attack
    ->param('scope', '', new Text(100), 'OAuth2 scope list.')
@@ -40,7 +40,7 @@ App::get('/v1/mock/tests/general/oauth2/token')
    ->groups(['mock'])
    ->label('scope', 'public')
    ->label('docs', false)
-    ->label('mock', true)
+    ->label('sdk.mock', true)
    ->param('client_id', '', new Text(100), 'OAuth2 Client ID.')
    ->param('client_secret', '', new Text(100), 'OAuth2 scope list.')
    ->param('grant_type', 'authorization_code', new WhiteList(['refresh_token', 'authorization_code']), 'OAuth2 Grant Type.', true)
@@ -162,15 +162,15 @@ App::post('/v1/mock/api-key-unprefixed')
    ->label('docs', false)
    ->param('projectId', '', new UID(), 'Project ID.')
    ->inject('response')
-    ->inject('dbForPlatform')
-    ->action(function (string $projectId, Response $response, Database $dbForPlatform) {
+    ->inject('dbForConsole')
+    ->action(function (string $projectId, Response $response, Database $dbForConsole) {
        $isDevelopment = System::getEnv('_APP_ENV', 'development') === 'development';

        if (!$isDevelopment) {
            throw new Exception(Exception::GENERAL_NOT_IMPLEMENTED);
        }

-        $project = $dbForPlatform->getDocument('projects', $projectId);
+        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
            throw new Exception(Exception::PROJECT_NOT_FOUND);
@@ -195,9 +195,9 @@ App::post('/v1/mock/api-key-unprefixed')
            'secret' => \bin2hex(\random_bytes(128)),
        ]);

-        $key = $dbForPlatform->createDocument('keys', $key);
+        $key = $dbForConsole->createDocument('keys', $key);

-        $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+        $dbForConsole->purgeCachedDocument('projects', $project->getId());

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -214,15 +214,15 @@ App::get('/v1/mock/github/callback')
    ->inject('gitHub')
    ->inject('project')
    ->inject('response')
-    ->inject('dbForPlatform')
-    ->action(function (string $providerInstallationId, string $projectId, GitHub $github, Document $project, Response $response, Database $dbForPlatform) {
+    ->inject('dbForConsole')
+    ->action(function (string $providerInstallationId, string $projectId, GitHub $github, Document $project, Response $response, Database $dbForConsole) {
        $isDevelopment = System::getEnv('_APP_ENV', 'development') === 'development';

        if (!$isDevelopment) {
            throw new Exception(Exception::GENERAL_NOT_IMPLEMENTED);
        }

-        $project = $dbForPlatform->getDocument('projects', $projectId);
+        $project = $dbForConsole->getDocument('projects', $projectId);

        if ($project->isEmpty()) {
            $error = 'Project with the ID from state could not be found.';
@@ -256,7 +256,7 @@ App::get('/v1/mock/github/callback')
                'personal' => false
            ]);

-            $installation = $dbForPlatform->createDocument('installations', $installation);
+            $installation = $dbForConsole->createDocument('installations', $installation);
        }

        $response->json([
@@ -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,14 +12,14 @@ 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;
+use Utopia\Abuse\Adapters\Database\TimeLimit;
 use Utopia\App;
 use Utopia\Cache\Adapter\Filesystem;
 use Utopia\Cache\Cache;
@@ -28,7 +29,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;

@@ -58,7 +59,7 @@ $parseLabel = function (string $label, array $responsePayload, array $requestPar
    return $label;
 };

-$eventDatabaseListener = function (Document $project, Document $document, Response $response, Event $queueForEvents, Func $queueForFunctions, Webhook $queueForWebhooks, Realtime $queueForRealtime) {
+$eventDatabaseListener = function (Document $document, Response $response, Event $queueForEvents, Func $queueForFunctions, Webhook $queueForWebhooks, Realtime $queueForRealtime) {
    // Only trigger events for user creation with the database listener.
    if ($document->getCollection() !== 'users') {
        return;
@@ -74,23 +75,20 @@ $eventDatabaseListener = function (Document $project, Document $document, Respon
        ->from($queueForEvents)
        ->trigger();

+    $queueForWebhooks
+        ->from($queueForEvents)
+        ->trigger();

-    /** Trigger webhooks events only if a project has them enabled */
-    if (!empty($project->getAttribute('webhooks'))) {
-        $queueForWebhooks
-            ->from($queueForEvents)
-            ->trigger();
+    if ($queueForEvents->getProject()->getId() === 'console') {
+        return;
    }

-    /** Trigger realtime events only for non console events */
-    if ($queueForEvents->getProject()->getId() !== 'console') {
-        $queueForRealtime
-            ->from($queueForEvents)
-            ->trigger();
-    }
+    $queueForRealtime
+        ->from($queueForEvents)
+        ->trigger();
 };

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

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

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

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

            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForStatsUsage
+                $queueForUsage
+                    ->addReduce($document);
+            }
+            break;
+        case $document->getCollection() === 'sites':
+            $queueForUsage
+                ->addMetric(METRIC_SITES, $value); // per project
+
+            if ($event === Database::EVENT_DOCUMENT_DELETE) {
+                $queueForUsage
                    ->addReduce($document);
            }
            break;
        case $document->getCollection() === 'deployments':
-            $queueForStatsUsage
+            $queueForUsage
                ->addMetric(METRIC_DEPLOYMENTS, $value) // per project
                ->addMetric(METRIC_DEPLOYMENTS_STORAGE, $document->getAttribute('size') * $value) // per project
                ->addMetric(str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getAttribute('resourceInternalId')], METRIC_FUNCTION_ID_DEPLOYMENTS), $value) // per function
@@ -178,98 +193,127 @@ App::init()
    ->groups(['api'])
    ->inject('utopia')
    ->inject('request')
-    ->inject('dbForPlatform')
-    ->inject('dbForProject')
-    ->inject('queueForAudits')
+    ->inject('dbForConsole')
    ->inject('project')
    ->inject('user')
    ->inject('session')
    ->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 $dbForConsole, 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', 3600, 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(),
-                ]);
-
-                $queueForAudits->setUser($user);
-            }
-
-            if ($apiKey->getType() === API_KEY_STANDARD) {
-                $dbKey = $project->find(
-                    key: 'secret',
-                    find: $request->getHeader('x-appwrite-key', ''),
-                    subject: 'keys'
-                );
-
-                if (!$dbKey) {
-                    throw new Exception(Exception::USER_UNAUTHORIZED);
+                try {
+                    $payload = $jwtObj->decode($authKey);
+                } catch (JWTException $error) {
+                    throw new Exception(Exception::API_KEY_EXPIRED);
                }

-                $accessedAt = $dbKey->getAttribute('accessedAt', '');
+                $projectId = $payload['projectId'] ?? '';
+                $tokenScopes = $payload['scopes'] ?? [];

-                if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_KEY_ACCESS)) > $accessedAt) {
-                    $dbKey->setAttribute('accessedAt', DateTime::now());
-                    $dbForPlatform->updateDocument('keys', $dbKey->getId(), $dbKey);
-                    $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+                // JWT includes project ID for better security
+                if ($projectId === $project->getId()) {
+                    $user = new Document([
+                        '$id' => '',
+                        'status' => true,
+                        'email' => 'app.' . $project->getId() . '@service.' . $request->getHostname(),
+                        'password' => '',
+                        'name' => $project->getAttribute('name', 'Untitled'),
+                    ]);
+
+                    $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.
                }
+            } elseif ($keyType === API_KEY_STANDARD) {
+                // No underline means no prefix. Backwards compatibility.
+                // Regular key

-                $sdkValidator = new WhiteList($servers, true);
-                $sdk = $request->getHeader('x-sdk-name', 'UNKNOWN');
+                // Check if given key match project API keys
+                $key = $project->find('secret', $apiKey, 'keys');
+                if ($key) {
+                    $user = new Document([
+                        '$id' => '',
+                        'status' => true,
+                        'email' => 'app.' . $project->getId() . '@service.' . $request->getHostname(),
+                        'password' => '',
+                        'name' => $project->getAttribute('name', 'Untitled'),
+                    ]);

-                if ($sdkValidator->isValid($sdk)) {
-                    $sdks = $dbKey->getAttribute('sdks', []);
+                    $role = Auth::USER_ROLE_APPS;
+                    $scopes = \array_merge($roles[$role]['scopes'], $key->getAttribute('scopes', []));

-                    if (!in_array($sdk, $sdks)) {
-                        $sdks[] = $sdk;
-                        $dbKey->setAttribute('sdks', $sdks);
+                    $expire = $key->getAttribute('expire');
+                    if (!empty($expire) && $expire < DateTime::formatTz(DateTime::now())) {
+                        throw new Exception(Exception::PROJECT_KEY_EXPIRED);
+                    }

-                        /** Update access time as well */
-                        $dbKey->setAttribute('accessedAt', Datetime::now());
-                        $dbForPlatform->updateDocument('keys', $dbKey->getId(), $dbKey);
-                        $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+                    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) {
+                        $key->setAttribute('accessedAt', DateTime::now());
+                        $dbForConsole->updateDocument('keys', $key->getId(), $key);
+                        $dbForConsole->purgeCachedDocument('projects', $project->getId());
+                    }
+
+                    $sdkValidator = new WhiteList($servers, true);
+                    $sdk = $request->getHeader('x-sdk-name', 'UNKNOWN');
+                    if ($sdkValidator->isValid($sdk)) {
+                        $sdks = $key->getAttribute('sdks', []);
+                        if (!in_array($sdk, $sdks)) {
+                            array_push($sdks, $sdk);
+                            $key->setAttribute('sdks', $sdks);
+
+                            /** Update access time as well */
+                            $key->setAttribute('accessedAt', Datetime::now());
+                            $dbForConsole->updateDocument('keys', $key->getId(), $key);
+                            $dbForConsole->purgeCachedDocument('projects', $project->getId());
+                        }
                    }
                }
-
-                $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 = [];
@@ -285,7 +329,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']);
            }
@@ -300,57 +344,25 @@ App::init()
            Authorization::setRole($authRole);
        }

-        // 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) {
-                $project->setAttribute('accessedAt', DateTime::now());
-                Authorization::skip(fn () => $dbForPlatform->updateDocument('projects', $project->getId(), $project));
-            }
-        }
-
-        // Update user last activity
-        if (!empty($user->getId())) {
-            $accessedAt = $user->getAttribute('accessedAt', '');
-            if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_USER_ACCESS)) > $accessedAt) {
-                $user->setAttribute('accessedAt', DateTime::now());
-
-                if (APP_MODE_ADMIN !== $mode) {
-                    $dbForProject->updateDocument('users', $user->getId(), $user);
-                } else {
-                    $dbForPlatform->updateDocument('users', $user->getId(), $user);
-                }
-            }
-        }
-
-        /**
-         * @var ?Method $method
-         */
-        $method = $route->getLabel('sdk', false);
-
-        if (\is_array($method)) {
-            $method = $method[0];
-        }
-
-        if (!empty($method)) {
-            $namespace = $method->getNamespace();
-
+        /** Do not allow access to disabled services */
+        $service = $route->getLabel('sdk.namespace', '');
+        if (!empty($service)) {
            if (
-                array_key_exists($namespace, $project->getAttribute('services', []))
-                && !$project->getAttribute('services', [])[$namespace]
+                array_key_exists($service, $project->getAttribute('services', []))
+                && !$project->getAttribute('services', [])[$service]
                && !(Auth::isPrivilegedUser(Authorization::getRoles()) || Auth::isAppUser(Authorization::getRoles()))
            ) {
                throw new Exception(Exception::GENERAL_SERVICE_DISABLED);
            }
        }

-        // 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);
        }
@@ -380,20 +392,17 @@ 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')
-    ->inject('plan')
-    ->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, array $plan) 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, string $mode) use ($usageDatabaseListener, $eventDatabaseListener) {

        $route = $utopia->getRoute();

@@ -416,7 +425,7 @@ App::init()
        foreach ($abuseKeyLabel as $abuseKey) {
            $start = $request->getContentRangeStart();
            $end = $request->getContentRangeEnd();
-            $timeLimit = $timelimit($abuseKey, $route->getLabel('abuse-limit', 0), $route->getLabel('abuse-time', 3600));
+            $timeLimit = new TimeLimit($abuseKey, $route->getLabel('abuse-limit', 0), $route->getLabel('abuse-time', 3600), $dbForProject);
            $timeLimit
                ->setParam('{projectId}', $project->getId())
                ->setParam('{userId}', $user->getId())
@@ -424,7 +433,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;
        }

@@ -444,7 +453,7 @@ App::init()
            $abuse = new Abuse($timeLimit);
            $remaining = $timeLimit->remaining();
            $limit = $timeLimit->limit();
-            $time = $timeLimit->time() + $route->getLabel('abuse-time', 3600);
+            $time = (new \DateTime($timeLimit->time()))->getTimestamp() + $route->getLabel('abuse-time', 3600);

            if ($limit && ($remaining < $closestLimit || is_null($closestLimit))) {
                $closestLimit = $remaining;
@@ -478,23 +487,9 @@ App::init()
            ->setMode($mode)
            ->setUserAgent($request->getUserAgent(''))
            ->setIP($request->getIP())
-            ->setHostname($request->getHostname())
            ->setEvent($route->getLabel('audits.event', ''))
-            ->setProject($project);
-
-        /* If a session exists, use the user associated with the session */
-        if (!$user->isEmpty()) {
-            $userClone = clone $user;
-            // $user doesn't support `type` and can cause unintended effects.
-            $userClone->setAttribute('type', Auth::ACTIVITY_TYPE_USER);
-            $queueForAudits->setUser($userClone);
-        }
-
-        if (!empty($apiKey) && !empty($apiKey->getDisabledMetrics())) {
-            foreach ($apiKey->getDisabledMetrics() as $key) {
-                $queueForStatsUsage->disableMetric($key);
-            }
-        }
+            ->setProject($project)
+            ->setUser($user);

        $queueForDeletes->setProject($project);
        $queueForDatabase->setProject($project);
@@ -503,16 +498,15 @@ 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,
                $response,
                $queueForEventsClone->from($queueForEvents),
@@ -523,10 +517,6 @@ App::init()

        $useCache = $route->getLabel('cache', false);
        if ($useCache) {
-            $route = $utopia->match($request);
-            $isImageTransformation = $route->getPath() === '/v1/storage/buckets/:bucketId/files/:fileId/preview';
-            $isDisabled = isset($plan['imageTransformations']) && $plan['imageTransformations'] === -1 && !Auth::isPrivilegedUser(Authorization::getRoles());
-
            $key = md5($request->getURI() . '*' . implode('*', $request->getParams()) . '*' . APP_CACHE_BUSTER);
            $cacheLog  = Authorization::skip(fn () => $dbForProject->getDocument('cache', $key));
            $cache = new Cache(
@@ -536,14 +526,17 @@ App::init()
            $data = $cache->load($key, $timestamp);

            if (!empty($data) && !$cacheLog->isEmpty()) {
-                $parts = explode('/', $cacheLog->getAttribute('resourceType', ''));
+                $parts = explode('/', $cacheLog->getAttribute('resourceType'));
                $type = $parts[0] ?? null;

-                if ($type === 'bucket' && (!$isImageTransformation || !$isDisabled)) {
+                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);
                    }

@@ -567,29 +560,20 @@ 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));
-                        }
-                    }
                }

                $response
                    ->addHeader('Cache-Control', sprintf('private, max-age=%d', $timestamp))
                    ->addHeader('X-Appwrite-Cache', 'hit')
-                    ->setContentType($cacheLog->getAttribute('mimeType'));
-                if (!$isImageTransformation || !$isDisabled) {
-                    $response->send($data);
-                }
+                    ->setContentType($cacheLog->getAttribute('mimeType'))
+                    ->send($data);
            } else {
                $response
                    ->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 +641,7 @@ App::shutdown()
    ->inject('user')
    ->inject('queueForEvents')
    ->inject('queueForAudits')
-    ->inject('queueForStatsUsage')
+    ->inject('queueForUsage')
    ->inject('queueForDeletes')
    ->inject('queueForDatabase')
    ->inject('queueForBuilds')
@@ -666,7 +650,9 @@ 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) {
+    ->inject('mode')
+    ->inject('dbForConsole')
+    ->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, string $mode, Database $dbForConsole) use ($parseLabel) {

        $responsePayload = $response->getPayload();

@@ -675,6 +661,10 @@ App::shutdown()
                $queueForEvents->setPayload($responsePayload);
            }

+            $queueForWebhooks
+                ->from($queueForEvents)
+                ->trigger();
+
            $queueForFunctions
                ->from($queueForEvents)
                ->trigger();
@@ -684,17 +674,6 @@ App::shutdown()
                    ->from($queueForEvents)
                    ->trigger();
            }
-
-            /** Trigger webhooks events only if a project has them enabled
-             * A future optimisation is to only trigger webhooks if the webhook is "enabled"
-             * But it might have performance implications on the API due to the number of webhooks etc.
-             * Some profiling is needed to see if this is a problem.
-            */
-            if (!empty($project->getAttribute('webhooks'))) {
-                $queueForWebhooks
-                    ->from($queueForEvents)
-                    ->trigger();
-            }
        }

        $route = $utopia->getRoute();
@@ -712,32 +691,10 @@ App::shutdown()
        }

        if (!$user->isEmpty()) {
-            $userClone = clone $user;
-            // $user doesn't support `type` and can cause unintended effects.
-            $userClone->setAttribute('type', Auth::ACTIVITY_TYPE_USER);
-            $queueForAudits->setUser($userClone);
-        } elseif ($queueForAudits->getUser() === null || $queueForAudits->getUser()->isEmpty()) {
-            /**
-             * User in the request is empty, and no user was set for auditing previously.
-             * This indicates:
-             * - No API Key was used.
-             * - No active session exists.
-             *
-             * Therefore, we consider this an anonymous request and create a relevant user.
-             */
-            $user = new Document([
-                '$id' => '',
-                'status' => true,
-                'type' => Auth::ACTIVITY_TYPE_GUEST,
-                'email' => 'guest.' . $project->getId() . '@service.' . $request->getHostname(),
-                'password' => '',
-                'name' => 'Guest',
-            ]);
-
            $queueForAudits->setUser($user);
        }

-        if (!empty($queueForAudits->getResource()) && !$queueForAudits->getUser()->isEmpty()) {
+        if (!empty($queueForAudits->getResource()) && !empty($queueForAudits->getUser()->getId())) {
            /**
             * audits.payload is switched to default true
             * in order to auto audit payload for all endpoints
@@ -750,7 +707,6 @@ App::shutdown()
            foreach ($queueForEvents->getParams() as $key => $value) {
                $queueForAudits->setParam($key, $value);
            }
-
            $queueForAudits->trigger();
        }

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

-        // Cache label
+        /**
+         * Cache label
+         */
        $useCache = $route->getLabel('cache', false);
        if ($useCache) {
            $resource = $resourceType = null;
@@ -814,6 +772,8 @@ App::shutdown()
            }
        }

+
+
        if ($project->getId() !== 'console') {
            if (!Auth::isPrivilegedUser(Authorization::getRoles())) {
                $fileSize = 0;
@@ -822,16 +782,43 @@ 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();
        }
+
+        /**
+         * 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) {
+                $project->setAttribute('accessedAt', DateTime::now());
+                Authorization::skip(fn () => $dbForConsole->updateDocument('projects', $project->getId(), $project));
+            }
+        }
+
+        /**
+         * Update user last activity
+         */
+        if (!$user->isEmpty()) {
+            $accessedAt = $user->getAttribute('accessedAt', '');
+            if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_USER_ACCESS)) > $accessedAt) {
+                $user->setAttribute('accessedAt', DateTime::now());
+
+                if (APP_MODE_ADMIN !== $mode) {
+                    $dbForProject->updateDocument('users', $user->getId(), $user);
+                } else {
+                    $dbForConsole->updateDocument('users', $user->getId(), $user);
+                }
+            }
+        }
    });

 App::init()
@@ -5,7 +5,6 @@ use Appwrite\Extend\Exception;
 use Appwrite\Utopia\Request;
 use MaxMind\Db\Reader;
 use Utopia\App;
-use Utopia\Config\Config;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Validator\Authorization;
@@ -58,44 +57,44 @@ App::init()

        $auths = $project->getAttribute('auths', []);
        switch ($route->getLabel('auth.type', '')) {
-            case 'email-password':
-                if (($auths[Config::getParam('auth')['email-password']['key']] ?? true) === false) {
+            case 'emailPassword':
+                if (($auths['emailPassword'] ?? true) === false) {
                    throw new Exception(Exception::USER_AUTH_METHOD_UNSUPPORTED, 'Email / Password authentication is disabled for this project');
                }
                break;

            case 'magic-url':
-                if (($auths[Config::getParam('auth')['magic-url']['key']] ?? true) === false) {
+                if (($auths['usersAuthMagicURL'] ?? true) === false) {
                    throw new Exception(Exception::USER_AUTH_METHOD_UNSUPPORTED, 'Magic URL authentication is disabled for this project');
                }
                break;

            case 'anonymous':
-                if (($auths[Config::getParam('auth')['anonymous']['key']] ?? true) === false) {
+                if (($auths['anonymous'] ?? true) === false) {
                    throw new Exception(Exception::USER_AUTH_METHOD_UNSUPPORTED, 'Anonymous authentication is disabled for this project');
                }
                break;

            case 'phone':
-                if (($auths[Config::getParam('auth')['phone']['key']] ?? true) === false) {
+                if (($auths['phone'] ?? true) === false) {
                    throw new Exception(Exception::USER_AUTH_METHOD_UNSUPPORTED, 'Phone authentication is disabled for this project');
                }
                break;

            case 'invites':
-                if (($auths[Config::getParam('auth')['invites']['key']] ?? true) === false) {
+                if (($auths['invites'] ?? true) === false) {
                    throw new Exception(Exception::USER_AUTH_METHOD_UNSUPPORTED, 'Invites authentication is disabled for this project');
                }
                break;

            case 'jwt':
-                if (($auths[Config::getParam('auth')['jwt']['key']] ?? true) === false) {
+                if (($auths['JWT'] ?? true) === false) {
                    throw new Exception(Exception::USER_AUTH_METHOD_UNSUPPORTED, 'JWT authentication is disabled for this project');
                }
                break;

            case 'email-otp':
-                if (($auths[Config::getParam('auth')['email-otp']['key']] ?? true) === false) {
+                if (($auths['emailOTP'] ?? true) === false) {
                    throw new Exception(Exception::USER_AUTH_METHOD_UNSUPPORTED, 'Email OTP authentication is disabled for this project');
                }
                break;
@@ -9,18 +9,16 @@ use Swoole\Http\Request as SwooleRequest;
 use Swoole\Http\Response as SwooleResponse;
 use Swoole\Http\Server;
 use Swoole\Process;
-use Swoole\Table;
+use Utopia\Abuse\Adapters\Database\TimeLimit;
 use Utopia\App;
 use Utopia\Audit\Audit;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
-use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
-use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Logger\Log;
 use Utopia\Logger\Log\User;
@@ -28,12 +26,6 @@ use Utopia\Pools\Group;
 use Utopia\Swoole\Files;
 use Utopia\System\System;

-const DOMAIN_SYNC_TIMER = 30; // 30 seconds
-
-$domains = new Table(1_000_000); // 1 million rows
-$domains->column('value', Table::TYPE_INT, 1);
-$domains->create();
-
 $http = new Server(
    host: "0.0.0.0",
    port: System::getEnv('PORT', 80),
@@ -41,110 +33,15 @@ $http = new Server(
 );

 $payloadSize = 12 * (1024 * 1024); // 12MB - adding slight buffer for headers and other data that might be sent with the payload - update later with valid testing
-$totalWorkers = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
-
-/**
- * Assigns HTTP requests to worker threads by analyzing its payload/content.
- *
- * Routes requests as 'safe' or 'risky' based on specific content patterns (like POST actions or certain domains)
- * to optimize load distribution between the workers. Utilizes `$safeThreadsPercent` to manage risk by assigning
- * riskier tasks to a dedicated worker subset. Prefers idle workers, with fallback to random selection if necessary.
- * doc: https://openswoole.com/docs/modules/swoole-server/configuration#dispatch_func
- *
- * @param Server $server Swoole server instance.
- * @param int $fd client ID
- * @param int $type the type of data and its current state
- * @param string|null $data Request content for categorization.
- * @global int $totalThreads Total number of workers.
- * @return int Chosen worker ID for the request.
- */
-function dispatch(Server $server, int $fd, int $type, $data = null): int
-{
-    $resolveWorkerId = function (Server $server, $data = null) {
-        global $totalWorkers, $domains;
-
-        // If data is not set we can send request to any worker
-        // first we try to pick idle worker, if not we randomly pick a worker
-        if ($data === null) {
-            for ($i = 0; $i < $totalWorkers; $i++) {
-                if ($server->getWorkerStatus($i) === SWOOLE_WORKER_IDLE) {
-                    return $i;
-                }
-            }
-            return rand(0, $totalWorkers - 1);
-        }
-
-        $riskyWorkersPercent = intval(System::getEnv('_APP_RISKY_WORKERS_PERCENT', 80)) / 100; // Decimal form 0 to 1
-
-        // Each worker has numeric ID, starting from 0 and incrementing
-        // From 0 to riskyWorkers, we consider safe workers
-        // From riskyWorkers to totalWorkers, we consider risky workers
-        $riskyWorkers = (int)floor($totalWorkers * $riskyWorkersPercent); // Absolute amount of risky workers
-
-        $domain = '';
-        // max up to 3 as first line has request details and second line has host
-        $lines = explode("\n", $data, 3);
-        $request = $lines[0];
-        if (count($lines) > 1) {
-            $domain = trim(explode('Host: ', $lines[1])[1]);
-        }
-
-        // Sync executions are considered risky
-        $risky = false;
-        if (str_starts_with($request, 'POST') && str_contains($request, '/executions')) {
-            $risky = true;
-        } elseif (str_ends_with($domain, System::getEnv('_APP_DOMAIN_FUNCTIONS'))) {
-            $risky = true;
-        } elseif ($domains->get(md5($domain), 'value') === 1) {
-            // executions request coming from custom domain
-            $risky = true;
-        }
-
-        if ($risky) {
-            // If risky request, only consider risky workers
-            for ($j = $riskyWorkers; $j < $totalWorkers; $j++) {
-                /** Reference https://openswoole.com/docs/modules/swoole-server-getWorkerStatus#description */
-                if ($server->getWorkerStatus($j) === SWOOLE_WORKER_IDLE) {
-                    // If idle worker found, give to him
-                    return $j;
-                }
-            }
-
-            // If no idle workers, give to random risky worker
-            $worker = rand($riskyWorkers, $totalWorkers - 1);
-            Console::warning("swoole_dispatch: Risky branch: did not find a idle worker, picking random worker {$worker}");
-            return $worker;
-        }
-
-        // If safe request, give to any idle worker
-        // Its fine to pick risky worker here, because it's idle. Idle is never actually risky
-        for ($i = 0; $i < $totalWorkers; $i++) {
-            if ($server->getWorkerStatus($i) === SWOOLE_WORKER_IDLE) {
-                return $i;
-            }
-        }
-
-        // If no idle worker found, give to random safe worker
-        // We avoid risky workers here, as it could be in work - not idle. Thats exactly when they are risky.
-        $worker = rand(0, $riskyWorkers - 1);
-        Console::warning("swoole_dispatch: Non-risky branch: did not find a idle worker, picking random worker {$worker}");
-        return $worker;
-    };
-    $workerId = $resolveWorkerId($server, $data);
-    $server->bind($fd, $workerId);
-    return $workerId;
-}
-
+$workerNumber = swoole_cpu_num() * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));

 $http
    ->set([
-        Constant::OPTION_WORKER_NUM => $totalWorkers,
-        Constant::OPTION_DISPATCH_FUNC => dispatch(...),
-        Constant::OPTION_DISPATCH_MODE => SWOOLE_DISPATCH_UIDMOD,
-        Constant::OPTION_HTTP_COMPRESSION => false,
-        Constant::OPTION_PACKAGE_MAX_LENGTH => $payloadSize,
-        Constant::OPTION_OUTPUT_BUFFER_SIZE => $payloadSize,
-        Constant::OPTION_TASK_WORKER_NUM => 1, // required for the task to fetch domains background
+        'worker_num' => $workerNumber,
+        'open_http2_protocol' => true,
+        'http_compression' => false,
+        'package_max_length' => $payloadSize,
+        'buffer_output_size' => $payloadSize,
    ]);

 $http->on(Constant::EVENT_WORKER_START, function ($server, $workerId) {
@@ -161,213 +58,166 @@ $http->on(Constant::EVENT_AFTER_RELOAD, function ($server, $workerId) {

 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');
+    $app->setCompression(true);
+    $app->setCompressionMinSize(intval(System::getEnv('_APP_COMPRESSION_MIN_SIZE_BYTES', '1024'))); // 1KB

    go(function () use ($register, $app) {
        $pools = $register->get('pools');
        /** @var Group $pools */
        App::setResource('pools', fn () => $pools);

+        // wait for database to be ready
+        $attempts = 0;
+        $max = 10;
+        $sleep = 1;
+
+        do {
+            try {
+                $attempts++;
+                $dbForConsole = $app->getResource('dbForConsole');
+                /** @var Utopia\Database\Database $dbForConsole */
+                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 database: appwrite...');
+            $dbForConsole->create();
+        } catch (\Throwable $e) {
+            Console::success('[Setup] - Skip: metadata table already exists');
+        }
+
+        if ($dbForConsole->getCollection(Audit::COLLECTION)->isEmpty()) {
+            $audit = new Audit($dbForConsole);
+            $audit->setup();
+        }
+
+        if ($dbForConsole->getCollection(TimeLimit::COLLECTION)->isEmpty()) {
+            $adapter = new TimeLimit("", 0, 1, $dbForConsole);
+            $adapter->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 (!$dbForConsole->getCollection($key)->isEmpty()) {
+                continue;
            }

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

-                $bucket = $dbForPlatform->getDocument('buckets', 'default');
+            $attributes = [];
+            $indexes = [];

-                Console::info("    └── Creating files collection for default bucket...");
-                $files = $collections['buckets']['files'] ?? [];
-                if (empty($files)) {
-                    throw new Exception('Files collection is not configured.');
-                }
+            foreach ($collection['attributes'] as $attribute) {
+                $attributes[] = new Document([
+                    '$id' => ID::custom($attribute['$id']),
+                    'type' => $attribute['type'],
+                    'size' => $attribute['size'],
+                    'required' => $attribute['required'],
+                    'signed' => $attribute['signed'],
+                    'array' => $attribute['array'],
+                    'filters' => $attribute['filters'],
+                    'default' => $attribute['default'] ?? null,
+                    'format' => $attribute['format'] ?? ''
+                ]);
+            }

-                $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([
+            foreach ($collection['indexes'] as $index) {
+                $indexes[] = new Document([
                    '$id' => ID::custom($index['$id']),
                    'type' => $index['type'],
                    'attributes' => $index['attributes'],
                    'lengths' => $index['lengths'],
                    'orders' => $index['orders'],
-                ]), $files['indexes']);
-
-                $dbForPlatform->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes);
-            }
-        });
-
-        $projectCollections = $collections['projects'];
-        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-        $sharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES_V1', ''));
-        $sharedTablesV2 = \array_diff($sharedTables, $sharedTablesV1);
-
-        $cache = $app->getResource('cache');
-
-        foreach ($sharedTablesV2 as $hostname) {
-            $adapter = $pools
-                ->get($hostname)
-                ->pop()
-                ->getResource();
-
-            $dbForProject = (new Database($adapter, $cache))
-                ->setDatabase('appwrite')
-                ->setSharedTables(true)
-                ->setTenant(null)
-                ->setNamespace(System::getEnv('_APP_DATABASE_SHARED_NAMESPACE', ''));
-
-            try {
-                Console::success('[Setup] - Creating project database: ' . $hostname . '...');
-                $dbForProject->create();
-            } catch (Duplicate) {
-                Console::success('[Setup] - Skip: metadata table already exists');
+                ]);
            }

-            if ($dbForProject->getCollection(Audit::COLLECTION)->isEmpty()) {
-                $audit = new Audit($dbForProject);
-                $audit->setup();
+            $dbForConsole->createCollection($key, $attributes, $indexes);
+        }
+
+        if ($dbForConsole->getDocument('buckets', 'default')->isEmpty() && !$dbForConsole->exists($dbForConsole->getDatabase(), 'bucket_1')) {
+            Console::success('[Setup] - Creating default bucket...');
+            $dbForConsole->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',
+            ]));
+
+            $bucket = $dbForConsole->getDocument('buckets', 'default');
+
+            Console::success('[Setup] - Creating files collection for default bucket...');
+            $files = $collections['buckets']['files'] ?? [];
+            if (empty($files)) {
+                throw new Exception('Files collection is not configured.');
            }

-            foreach ($projectCollections as $key => $collection) {
-                if (($collection['$collection'] ?? '') !== Database::METADATA) {
-                    continue;
-                }
-                if (!$dbForProject->getCollection($key)->isEmpty()) {
-                    continue;
-                }
+            $attributes = [];
+            $indexes = [];

-                $attributes = \array_map(fn ($attribute) => new Document($attribute), $collection['attributes']);
-                $indexes = \array_map(fn (array $index) => new Document($index), $collection['indexes']);
-
-                Console::success('[Setup] - Creating project collection: ' . $collection['$id'] . '...');
-
-                $dbForProject->createCollection($key, $attributes, $indexes);
+            foreach ($files['attributes'] as $attribute) {
+                $attributes[] = new Document([
+                    '$id' => ID::custom($attribute['$id']),
+                    'type' => $attribute['type'],
+                    'size' => $attribute['size'],
+                    'required' => $attribute['required'],
+                    'signed' => $attribute['signed'],
+                    'array' => $attribute['array'],
+                    'filters' => $attribute['filters'],
+                    'default' => $attribute['default'] ?? null,
+                    'format' => $attribute['format'] ?? ''
+                ]);
            }
+
+            foreach ($files['indexes'] as $index) {
+                $indexes[] = new Document([
+                    '$id' => ID::custom($index['$id']),
+                    'type' => $index['type'],
+                    'attributes' => $index['attributes'],
+                    'lengths' => $index['lengths'],
+                    'orders' => $index['orders'],
+                ]);
+            }
+
+            $dbForConsole->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes);
        }

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

    Console::success('Server started successfully (max payload is ' . number_format($payloadSize) . ' bytes)');
    Console::info("Master pid {$http->master_pid}, manager pid {$http->manager_pid}");

-    // Start the task that starts fetching custom domains
-    $http->task([], 0);
-
    // listen ctrl + c
    Process::signal(2, function () use ($http) {
        Console::log('Stop by Ctrl+C');
@@ -375,7 +225,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
    });
 });

-$http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, SwooleResponse $swooleResponse) use ($register) {
+$http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swooleResponse) use ($register) {
    App::setResource('swooleRequest', fn () => $swooleRequest);
    App::setResource('swooleResponse', fn () => $swooleResponse);

@@ -395,7 +245,7 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool
    }

    $app = new App('UTC');
-    $app->setCompression(System::getEnv('_APP_COMPRESSION_ENABLED', 'enabled') === 'enabled');
+    $app->setCompression(true);
    $app->setCompressionMinSize(intval(System::getEnv('_APP_COMPRESSION_MIN_SIZE_BYTES', '1024'))); // 1KB

    $pools = $register->get('pools');
@@ -424,12 +274,10 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool

            if (isset($user) && !$user->isEmpty()) {
                $log->setUser(new User($user->getId()));
-            } else {
-                $log->setUser(new User('guest-' . hash('sha256', $request->getIP())));
            }

            $log->setNamespace("http");
-            $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
+            $log->setServer(\gethostname());
            $log->setVersion($version);
            $log->setType(Log::TYPE_ERROR);
            $log->setMessage($th->getMessage());
@@ -447,16 +295,8 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool
            $log->addExtra('trace', $th->getTraceAsString());
            $log->addExtra('roles', Authorization::getRoles());

-            $sdk = $route->getLabel("sdk", false);
-
-            $action = 'UNKNOWN_NAMESPACE.UNKNOWN.METHOD';
-            if (!empty($sdk)) {
-                /** @var Appwrite\SDK\Method $sdk */
-                $action = $sdk->getNamespace() . '.' . $sdk->getMethodName();
-            }
-
+            $action = $route->getLabel("sdk.namespace", "UNKNOWN_NAMESPACE") . '.' . $route->getLabel("sdk.method", "UNKNOWN_METHOD");
            $log->setAction($action);
-            $log->addTag('service', $action);

            $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
            $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
@@ -495,59 +335,4 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool
    }
 });

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

        $database = new Database($adapter, getCache());

-        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-
-        if (\in_array($dsn->getHost(), $sharedTables)) {
+        if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
            $database
                ->setSharedTables(true)
                ->setTenant($project->getInternalId())
@@ -138,32 +136,6 @@ if (!function_exists('getCache')) {
    }
 }

-// Allows overriding
-if (!function_exists('getRedis')) {
-    function getRedis(): \Redis
-    {
-        $host = System::getEnv('_APP_REDIS_HOST', 'localhost');
-        $port = System::getEnv('_APP_REDIS_PORT', 6379);
-        $pass = System::getEnv('_APP_REDIS_PASS', '');
-
-        $redis = new \Redis();
-        @$redis->pconnect($host, (int)$port);
-        if ($pass) {
-            $redis->auth($pass);
-        }
-        $redis->setOption(\Redis::OPT_READ_TIMEOUT, -1);
-
-        return $redis;
-    }
-}
-
-if (!function_exists('getTimelimit')) {
-    function getTimelimit(): TimeLimitRedis
-    {
-        return new TimeLimitRedis("", 0, 1, getRedis());
-    }
-}
-
 if (!function_exists('getRealtime')) {
    function getRealtime(): Realtime
    {
@@ -193,7 +165,7 @@ $stats->create();

 $containerId = uniqid();
 $statsDocument = null;
-$workerNumber = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
+$workerNumber = swoole_cpu_num() * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));

 $adapter = new Adapter\Swoole(port: System::getEnv('PORT', 80));
 $adapter
@@ -210,7 +182,7 @@ $logError = function (Throwable $error, string $action) use ($register) {

        $log = new Log();
        $log->setNamespace("realtime");
-        $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
+        $log->setServer(gethostname());
        $log->setVersion($version);
        $log->setType(Log::TYPE_ERROR);
        $log->setMessage($error->getMessage());
@@ -507,7 +479,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
            throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
        }

-        $timelimit = $app->getResource('timelimit');
+        $dbForProject = getProjectDB($project);
        $console = $app->getResource('console'); /** @var Document $console */
        $user = $app->getResource('user'); /** @var Document $user */

@@ -516,12 +488,12 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
         *
         * Abuse limits are connecting 128 times per minute and ip address.
         */
-        $timelimit = $timelimit('url:{url},ip:{ip}', 128, 60);
-        $timelimit
+        $timeLimit = new TimeLimit('url:{url},ip:{ip}', 128, 60, $dbForProject);
+        $timeLimit
            ->setParam('{ip}', $request->getIP())
            ->setParam('{url}', $request->getURI());

-        $abuse = new Abuse($timelimit);
+        $abuse = new Abuse($timeLimit);

        if (System::getEnv('_APP_OPTIONS_ABUSE', 'enabled') === 'enabled' && $abuse->check()) {
            throw new Exception(Exception::REALTIME_TOO_MANY_MESSAGES, 'Too many requests');
@@ -619,7 +591,7 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
         *
         * Abuse limits are sending 32 times per minute and connection.
         */
-        $timeLimit = getTimelimit('url:{url},connection:{connection}', 32, 60);
+        $timeLimit = new TimeLimit('url:{url},connection:{connection}', 32, 60, $database);

        $timeLimit
            ->setParam('{connection}', $connection)
@@ -704,10 +676,11 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
 $server->onClose(function (int $connection) use ($realtime, $stats, $register) {
    if (array_key_exists($connection, $realtime->connections)) {
        $stats->decr($realtime->connections[$connection]['projectId'], 'connectionsTotal');
-        $register->get('telemetry.connectionCounter')->add(-1);
    }
    $realtime->unsubscribe($connection);

+    $register->get('telemetry.connectionCounter')->add(-1);
+
    Console::info('Connection close: ' . $connection);
 });

@@ -86,7 +86,7 @@ $image = $this->getParam('image', '');
      - _APP_OPTIONS_ABUSE
      - _APP_OPTIONS_ROUTER_PROTECTION
      - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
+      - _APP_OPTIONS_COMPUTE_FORCE_HTTPS
      - _APP_OPENSSL_KEY_V1
      - _APP_DOMAIN
      - _APP_DOMAIN_TARGET
@@ -116,7 +116,6 @@ $image = $this->getParam('image', '');
      - _APP_STORAGE_S3_SECRET
      - _APP_STORAGE_S3_REGION
      - _APP_STORAGE_S3_BUCKET
-      - _APP_STORAGE_S3_ENDPOINT
      - _APP_STORAGE_DO_SPACES_ACCESS_KEY
      - _APP_STORAGE_DO_SPACES_SECRET
      - _APP_STORAGE_DO_SPACES_REGION
@@ -133,12 +132,14 @@ $image = $this->getParam('image', '');
      - _APP_STORAGE_WASABI_SECRET
      - _APP_STORAGE_WASABI_REGION
      - _APP_STORAGE_WASABI_BUCKET
-      - _APP_FUNCTIONS_SIZE_LIMIT
-      - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
+      - _APP_COMPUTE_SIZE_LIMIT
+      - _APP_COMPUTE_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
      - _APP_FUNCTIONS_RUNTIMES
+      - _APP_SITES_FRAMEWORKS
+      - _APP_SITES_RUNTIMES
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
      - _APP_LOGGING_CONFIG
@@ -148,7 +149,6 @@ $image = $this->getParam('image', '');
      - _APP_MAINTENANCE_RETENTION_CACHE
      - _APP_MAINTENANCE_RETENTION_ABUSE
      - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
      - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
      - _APP_MAINTENANCE_RETENTION_SCHEDULES
      - _APP_SMS_PROVIDER
@@ -165,10 +165,11 @@ $image = $this->getParam('image', '');
      - _APP_MIGRATIONS_FIREBASE_CLIENT_ID
      - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
      - _APP_ASSISTANT_OPENAI_API_KEY
+
  appwrite-console:
    <<: *x-logging
    container_name: appwrite-console
-    image: <?php echo $organization; ?>/console:5.2.58
+    image: <?php echo $organization; ?>/console:5.0.12
    restart: unless-stopped
    networks:
      - appwrite
@@ -319,7 +320,6 @@ $image = $this->getParam('image', '');
      - _APP_STORAGE_S3_SECRET
      - _APP_STORAGE_S3_REGION
      - _APP_STORAGE_S3_BUCKET
-      - _APP_STORAGE_S3_ENDPOINT
      - _APP_STORAGE_DO_SPACES_ACCESS_KEY
      - _APP_STORAGE_DO_SPACES_SECRET
      - _APP_STORAGE_DO_SPACES_REGION
@@ -341,10 +341,7 @@ $image = $this->getParam('image', '');
      - _APP_EXECUTOR_HOST
      - _APP_MAINTENANCE_RETENTION_ABUSE
      - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
      - _APP_MAINTENANCE_RETENTION_EXECUTION
-      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
-      - _APP_EMAIL_CERTIFICATES

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

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

-  appwrite-worker-stats-usage:
+  appwrite-worker-usage-dump:
    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
-    entrypoint: worker-stats-usage
-    container_name: appwrite-worker-stats-usage
+    entrypoint: worker-usage-dump
    <<: *x-logging
+    container_name: appwrite-worker-usage-dump
    restart: unless-stopped
    networks:
      - appwrite
@@ -835,7 +798,7 @@ $image = $this->getParam('image', '');
    <<: *x-logging
    restart: unless-stopped
    stop_signal: SIGINT
-    image: openruntimes/executor:0.6.11
+    image: openruntimes/executor:0.7.0
    networks:
      - appwrite
      - runtimes
@@ -847,9 +810,9 @@ $image = $this->getParam('image', '');
      # It's not possible to share mount file between 2 containers without host mount (copying is too slow)
      - /tmp:/tmp:rw
    environment:
-      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_FUNCTIONS_INACTIVE_THRESHOLD
-      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_FUNCTIONS_MAINTENANCE_INTERVAL
-      - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_COMPUTE_INACTIVE_THRESHOLD
+      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_COMPUTE_MAINTENANCE_INTERVAL
+      - OPR_EXECUTOR_NETWORK=$_APP_COMPUTE_RUNTIMES_NETWORK
      - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD
      - OPR_EXECUTOR_ENV=$_APP_ENV
@@ -861,7 +824,6 @@ $image = $this->getParam('image', '');
      - OPR_EXECUTOR_STORAGE_S3_SECRET=$_APP_STORAGE_S3_SECRET
      - OPR_EXECUTOR_STORAGE_S3_REGION=$_APP_STORAGE_S3_REGION
      - OPR_EXECUTOR_STORAGE_S3_BUCKET=$_APP_STORAGE_S3_BUCKET
-      - OPR_EXECUTOR_STORAGE_S3_ENDPOINT=$_APP_STORAGE_S3_ENDPOINT
      - OPR_EXECUTOR_STORAGE_DO_SPACES_ACCESS_KEY=$_APP_STORAGE_DO_SPACES_ACCESS_KEY
      - OPR_EXECUTOR_STORAGE_DO_SPACES_SECRET=$_APP_STORAGE_DO_SPACES_SECRET
      - OPR_EXECUTOR_STORAGE_DO_SPACES_REGION=$_APP_STORAGE_DO_SPACES_REGION
@@ -2,7 +2,6 @@

 require_once __DIR__ . '/init.php';

-use Appwrite\Certificates\LetsEncrypt;
 use Appwrite\Event\Audit;
 use Appwrite\Event\Build;
 use Appwrite\Event\Certificate;
@@ -13,13 +12,11 @@ use Appwrite\Event\Func;
 use Appwrite\Event\Mail;
 use Appwrite\Event\Messaging;
 use Appwrite\Event\Migration;
-use Appwrite\Event\Realtime;
-use Appwrite\Event\StatsUsage;
-use Appwrite\Event\Webhook;
+use Appwrite\Event\Usage;
+use Appwrite\Event\UsageDump;
 use Appwrite\Platform\Appwrite;
-use Executor\Executor;
 use Swoole\Runtime;
-use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
+use Utopia\App;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
 use Utopia\CLI\Console;
@@ -33,8 +30,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;
@@ -44,7 +41,7 @@ Runtime::enableCoroutine(SWOOLE_HOOK_ALL);

 Server::setResource('register', fn () => $register);

-Server::setResource('dbForPlatform', function (Cache $cache, Registry $register) {
+Server::setResource('dbForConsole', function (Cache $cache, Registry $register) {
    $pools = $register->get('pools');
    $database = $pools
        ->get('console')
@@ -57,7 +54,7 @@ Server::setResource('dbForPlatform', function (Cache $cache, Registry $register)
    return $adapter;
 }, ['cache', 'register']);

-Server::setResource('project', function (Message $message, Database $dbForPlatform) {
+Server::setResource('project', function (Message $message, Database $dbForConsole) {
    $payload = $message->getPayload() ?? [];
    $project = new Document($payload['project'] ?? []);

@@ -65,12 +62,12 @@ Server::setResource('project', function (Message $message, Database $dbForPlatfo
        return $project;
    }

-    return $dbForPlatform->getDocument('projects', $project->getId());
-}, ['message', 'dbForPlatform']);
+    return $dbForConsole->getDocument('projects', $project->getId());
+}, ['message', 'dbForConsole']);

-Server::setResource('dbForProject', function (Cache $cache, Registry $register, Message $message, Document $project, Database $dbForPlatform) {
+Server::setResource('dbForProject', function (Cache $cache, Registry $register, Message $message, Document $project, Database $dbForConsole) {
    if ($project->isEmpty() || $project->getId() === 'console') {
-        return $dbForPlatform;
+        return $dbForConsole;
    }

    $pools = $register->get('pools');
@@ -96,9 +93,7 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
        $dsn = new DSN('mysql://' . $project->getAttribute('database'));
    }

-    $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-
-    if (\in_array($dsn->getHost(), $sharedTables)) {
+    if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
        $database
            ->setSharedTables(true)
            ->setTenant($project->getInternalId())
@@ -110,17 +105,15 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
            ->setNamespace('_' . $project->getInternalId());
    }

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

-Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache) {
+Server::setResource('getProjectDB', function (Group $pools, Database $dbForConsole, $cache) {
    $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools

-    return function (Document $project) use ($pools, $dbForPlatform, $cache, &$databases): Database {
+    return function (Document $project) use ($pools, $dbForConsole, $cache, &$databases): Database {
        if ($project->isEmpty() || $project->getId() === 'console') {
-            return $dbForPlatform;
+            return $dbForConsole;
        }

        try {
@@ -133,9 +126,7 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatf
        if (isset($databases[$dsn->getHost()])) {
            $database = $databases[$dsn->getHost()];

-            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-
-            if (\in_array($dsn->getHost(), $sharedTables)) {
+            if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
                $database
                    ->setSharedTables(true)
                    ->setTenant($project->getInternalId())
@@ -159,9 +150,7 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatf

        $databases[$dsn->getHost()] = $database;

-        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-
-        if (\in_array($dsn->getHost(), $sharedTables)) {
+        if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
            $database
                ->setSharedTables(true)
                ->setTenant($project->getInternalId())
@@ -173,58 +162,20 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatf
                ->setNamespace('_' . $project->getInternalId());
        }

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

 Server::setResource('abuseRetention', function () {
-    return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400); // 1 day
+    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400));
 });

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

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

 Server::setResource('cache', function (Registry $register) {
@@ -243,88 +194,59 @@ Server::setResource('cache', function (Registry $register) {
    return new Cache(new Sharding($adapters));
 }, ['register']);

-Server::setResource('redis', function () {
-    $host = System::getEnv('_APP_REDIS_HOST', 'localhost');
-    $port = System::getEnv('_APP_REDIS_PORT', 6379);
-    $pass = System::getEnv('_APP_REDIS_PASS', '');
-
-    $redis = new \Redis();
-    @$redis->pconnect($host, (int)$port);
-    if ($pass) {
-        $redis->auth($pass);
-    }
-    $redis->setOption(\Redis::OPT_READ_TIMEOUT, -1);
-
-    return $redis;
-});
-
-Server::setResource('timelimit', function (\Redis $redis) {
-    return function (string $key, int $limit, int $time) use ($redis) {
-        return new TimeLimitRedis($key, $limit, $time, $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('queueForDatabase', function (Publisher $publisher) {
-    return new EventDatabase($publisher);
-}, ['publisher']);
+Server::setResource('queueForMails', function (Connection $queue) {
+    return new Mail($queue);
+}, ['queue']);

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

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

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

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

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

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

-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');
@@ -334,6 +256,10 @@ Server::setResource('pools', function (Registry $register) {
    return $register->get('pools');
 }, ['register']);

+Server::setResource('deviceForSites', function (Document $project) {
+    return getDevice(APP_STORAGE_SITES . '/app-' . $project->getId());
+}, ['project']);
+
 Server::setResource('deviceForFunctions', function (Document $project) {
    return getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId());
 }, ['project']);
@@ -355,15 +281,6 @@ Server::setResource(
    fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false
 );

-Server::setResource('certificates', function () {
-    $email = System::getEnv('_APP_EMAIL_CERTIFICATES', System::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS'));
-    if (empty($email)) {
-        throw new Exception('You must set a valid security email address (_APP_EMAIL_CERTIFICATES) to issue a LetsEncrypt SSL certificate.');
-    }
-
-    return new LetsEncrypt($email);
-});
-
 Server::setResource('logError', function (Registry $register, Document $project) {
    return function (Throwable $error, string $namespace, string $action, ?array $extras) use ($register, $project) {
        $logger = $register->get('logger');
@@ -373,7 +290,7 @@ Server::setResource('logError', function (Registry $register, Document $project)

            $log = new Log();
            $log->setNamespace($namespace);
-            $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
+            $log->setServer(\gethostname());
            $log->setVersion($version);
            $log->setType(Log::TYPE_ERROR);
            $log->setMessage($error->getMessage());
@@ -409,8 +326,6 @@ Server::setResource('logError', function (Registry $register, Document $project)
    };
 }, ['register', 'project']);

-Server::setResource('executor', fn () => new Executor(fn (string $projectId, string $deploymentId) => System::getEnv('_APP_EXECUTOR_HOST')));
-
 $pools = $register->get('pools');
 $platform = new Appwrite();
 $args = $platform->getEnv('argv');
@@ -438,7 +353,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
    ]);
@@ -468,7 +383,7 @@ $worker

        if ($logger) {
            $log->setNamespace("appwrite-worker");
-            $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
+            $log->setServer(\gethostname());
            $log->setVersion($version);
            $log->setType(Log::TYPE_ERROR);
            $log->setMessage($error->getMessage());
@@ -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 $@
@@ -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 $@
@@ -45,34 +45,34 @@
        "ext-sockets": "*",
        "appwrite/php-runtimes": "0.16.*",
        "appwrite/php-clamav": "2.0.*",
-        "utopia-php/abuse": "0.52.*",
+        "utopia-php/abuse": "0.43.0",
        "utopia-php/analytics": "0.10.*",
-        "utopia-php/audit": "0.55.*",
-        "utopia-php/cache": "0.12.*",
+        "utopia-php/audit": "0.43.0",
+        "utopia-php/cache": "0.11.*",
        "utopia-php/cli": "0.15.*",
        "utopia-php/config": "0.2.*",
-        "utopia-php/database": "0.66.*",
+        "utopia-php/database": "0.53.16",
        "utopia-php/domains": "0.5.*",
        "utopia-php/dsn": "0.2.1",
        "utopia-php/framework": "0.33.*",
-        "utopia-php/fetch": "0.4.*",
-        "utopia-php/image": "0.8.*",
+        "utopia-php/fetch": "0.2.*",
+        "utopia-php/image": "0.7.*",
        "utopia-php/locale": "0.4.*",
        "utopia-php/logger": "0.6.*",
-        "utopia-php/messaging": "0.16.*",
-        "utopia-php/migration": "0.9.*",
+        "utopia-php/messaging": "0.12.*",
+        "utopia-php/migration": "0.6.*",
        "utopia-php/orchestration": "0.9.*",
        "utopia-php/platform": "0.7.*",
-        "utopia-php/pools": "0.8.*",
+        "utopia-php/pools": "0.5.*",
        "utopia-php/preloader": "0.2.*",
-        "utopia-php/queue": "0.9.*",
+        "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/websocket": "0.3.*",
+        "utopia-php/vcs": "0.8.*",
+        "utopia-php/websocket": "0.1.*",
        "matomo/device-detector": "6.1.*",
        "dragonmantank/cron-expression": "3.3.2",
        "phpmailer/phpmailer": "6.9.1",
@@ -84,12 +84,12 @@
    },
    "require-dev": {
        "ext-fileinfo": "*",
-        "appwrite/sdk-generator": "0.40.*",
-        "phpunit/phpunit": "9.*",
+        "appwrite/sdk-generator": "0.39.*",
+        "phpunit/phpunit": "9.5.20",
        "swoole/ide-helper": "5.1.2",
-        "textalk/websocket": "1.5.*",
-        "laravel/pint": "1.*",
-        "phpbench/phpbench": "1.*"
+        "textalk/websocket": "1.5.7",
+        "laravel/pint": "^1.14",
+        "phpbench/phpbench": "^1.2"
    },
    "provide": {
        "ext-phpiredis": "*"
@@ -99,8 +99,8 @@
            "php": "8.3"
        },
        "allow-plugins": {
-            "php-http/discovery": false,
-            "tbachert/spi": false
+            "php-http/discovery": true,
+            "tbachert/spi": true
        }
    }
 }
@@ -76,6 +76,7 @@ services:
      - appwrite-config:/storage/config:rw
      - appwrite-certificates:/storage/certificates:rw
      - appwrite-functions:/storage/functions:rw
+      - appwrite-builds:/storage/builds:rw
      - ./phpunit.xml:/usr/src/code/phpunit.xml
      - ./tests:/usr/src/code/tests
      - ./app:/usr/src/code/app
@@ -110,7 +111,7 @@ services:
      - _APP_OPTIONS_ABUSE
      - _APP_OPTIONS_ROUTER_PROTECTION
      - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
+      - _APP_OPTIONS_COMPUTE_FORCE_HTTPS
      - _APP_OPENSSL_KEY_V1
      - _APP_DOMAIN
      - _APP_DOMAIN_TARGET
@@ -140,7 +141,6 @@ services:
      - _APP_STORAGE_S3_SECRET
      - _APP_STORAGE_S3_REGION
      - _APP_STORAGE_S3_BUCKET
-      - _APP_STORAGE_S3_ENDPOINT
      - _APP_STORAGE_DO_SPACES_ACCESS_KEY
      - _APP_STORAGE_DO_SPACES_SECRET
      - _APP_STORAGE_DO_SPACES_REGION
@@ -157,12 +157,15 @@ services:
      - _APP_STORAGE_WASABI_SECRET
      - _APP_STORAGE_WASABI_REGION
      - _APP_STORAGE_WASABI_BUCKET
-      - _APP_FUNCTIONS_SIZE_LIMIT
-      - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
+      - _APP_COMPUTE_SIZE_LIMIT
+      - _APP_COMPUTE_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
      - _APP_FUNCTIONS_RUNTIMES
+      - _APP_SITES_RUNTIMES
+      - _APP_SITES_FRAMEWORKS
+      - _APP_DOMAIN_SITES
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
      - _APP_LOGGING_CONFIG
@@ -171,7 +174,6 @@ services:
      - _APP_MAINTENANCE_RETENTION_CACHE
      - _APP_MAINTENANCE_RETENTION_ABUSE
      - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
      - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
      - _APP_MAINTENANCE_RETENTION_SCHEDULES
      - _APP_SMS_PROVIDER
@@ -195,17 +197,11 @@ services:
      - _APP_EXPERIMENT_LOGGING_PROVIDER
      - _APP_EXPERIMENT_LOGGING_CONFIG
      - _APP_DATABASE_SHARED_TABLES
-      - _APP_DATABASE_SHARED_TABLES_V1
-      - _APP_DATABASE_SHARED_NAMESPACE
-      - _APP_FUNCTIONS_CREATION_ABUSE_LIMIT
-      - _APP_CUSTOM_DOMAIN_DENY_LIST
-    extra_hosts:
-      - "host.docker.internal:host-gateway"

  appwrite-console:
    <<: *x-logging
    container_name: appwrite-console
-    image: appwrite/console:5.2.58
+    image: appwrite/console:5.0.12
    restart: unless-stopped
    networks:
      - appwrite
@@ -370,7 +366,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
@@ -391,10 +386,6 @@ services:
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
      - _APP_DATABASE_SHARED_TABLES
-      - _APP_DATABASE_SHARED_TABLES_V1
-      - _APP_EMAIL_CERTIFICATES
-      - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE

  appwrite-worker-databases:
    entrypoint: worker-databases
@@ -461,20 +452,19 @@ services:
      - _APP_VCS_GITHUB_APP_NAME
      - _APP_VCS_GITHUB_PRIVATE_KEY
      - _APP_VCS_GITHUB_APP_ID
-      - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
-      - _APP_FUNCTIONS_SIZE_LIMIT
+      - _APP_COMPUTE_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
+      - _APP_COMPUTE_SIZE_LIMIT
      - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
+      - _APP_OPTIONS_COMPUTE_FORCE_HTTPS
      - _APP_DOMAIN
      - _APP_STORAGE_DEVICE
      - _APP_STORAGE_S3_ACCESS_KEY
      - _APP_STORAGE_S3_SECRET
      - _APP_STORAGE_S3_REGION
      - _APP_STORAGE_S3_BUCKET
-      - _APP_STORAGE_S3_ENDPOINT
      - _APP_STORAGE_DO_SPACES_ACCESS_KEY
      - _APP_STORAGE_DO_SPACES_SECRET
      - _APP_STORAGE_DO_SPACES_REGION
@@ -492,8 +482,7 @@ services:
      - _APP_STORAGE_WASABI_REGION
      - _APP_STORAGE_WASABI_BUCKET
      - _APP_DATABASE_SHARED_TABLES
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
+      - _APP_DOMAIN_SITES

  appwrite-worker-certificates:
    entrypoint: worker-certificates
@@ -559,10 +548,10 @@ services:
      - _APP_DB_SCHEMA
      - _APP_DB_USER
      - _APP_DB_PASS
-      - _APP_FUNCTIONS_TIMEOUT
-      - _APP_FUNCTIONS_BUILD_TIMEOUT
-      - _APP_FUNCTIONS_CPUS
-      - _APP_FUNCTIONS_MEMORY
+      - _APP_COMPUTE_TIMEOUT
+      - _APP_COMPUTE_BUILD_TIMEOUT
+      - _APP_COMPUTE_CPUS
+      - _APP_COMPUTE_MEMORY
      - _APP_EXECUTOR_SECRET
      - _APP_EXECUTOR_HOST
      - _APP_USAGE_STATS
@@ -642,7 +631,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
@@ -729,47 +717,15 @@ services:
      - _APP_MAINTENANCE_RETENTION_CACHE
      - _APP_MAINTENANCE_RETENTION_ABUSE
      - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
      - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
      - _APP_MAINTENANCE_RETENTION_SCHEDULES
      - _APP_MAINTENANCE_DELAY
      - _APP_DATABASE_SHARED_TABLES

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

-  appwrite-worker-stats-usage:
-    entrypoint: worker-stats-usage
+  appwrite-worker-usage-dump:
+    entrypoint: worker-usage-dump
    <<: *x-logging
-    container_name: appwrite-worker-stats-usage
+    container_name: appwrite-worker-usage-dump
    image: appwrite-dev
    networks:
      - appwrite
@@ -913,7 +869,7 @@ services:

  appwrite-assistant:
    container_name: appwrite-assistant
-    image: appwrite/assistant:0.7.0
+    image: appwrite/assistant:0.5.0
    networks:
      - appwrite
    environment:
@@ -924,7 +880,7 @@ services:
    hostname: exc1
    <<: *x-logging
    stop_signal: SIGINT
-    image: openruntimes/executor:0.6.11
+    image: openruntimes/executor:0.7.0
    restart: unless-stopped
    networks:
      - appwrite
@@ -937,13 +893,13 @@ services:
      # It's not possible to share mount file between 2 containers without host mount (copying is too slow)
      - /tmp:/tmp:rw
    environment:
-      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_FUNCTIONS_INACTIVE_THRESHOLD
-      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_FUNCTIONS_MAINTENANCE_INTERVAL
-      - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_COMPUTE_INACTIVE_THRESHOLD
+      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_COMPUTE_MAINTENANCE_INTERVAL
+      - OPR_EXECUTOR_NETWORK=$_APP_COMPUTE_RUNTIMES_NETWORK
      - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
      - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD
      - OPR_EXECUTOR_ENV=$_APP_ENV
-      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
+      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES,$_APP_SITES_RUNTIMES
      - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
      - OPR_EXECUTOR_RUNTIME_VERSIONS=v2,v4
      - OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
@@ -952,7 +908,6 @@ services:
      - 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
@@ -1104,4 +1059,4 @@ volumes:
  appwrite-certificates:
  appwrite-functions:
  appwrite-builds:
-  appwrite-config:
+  appwrite-config:
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matej BačoandGitHub	c509ec56bd	Merge branch 'feat-sites' into feat-add-fallbackFile-attribute	2024-11-20 14:33:19 +01:00
Matej BačoandGitHub	a25b786fca	Merge pull request #9010 from appwrite/chore-add-site-domains-var Add _APP_DOMAIN_SITES to console variables	2024-11-20 14:33:02 +01:00
Matej Bačo	06224aa34e	formatting fix	2024-11-20 14:19:15 +01:00
Matej Bačo	4bcbd49d6d	Formatting fix	2024-11-20 14:18:43 +01:00
Matej BačoandGitHub	09e2ded206	Merge branch 'feat-sites' into feat-add-fallbackFile-attribute	2024-11-20 14:14:28 +01:00
Matej BačoandGitHub	4a8c063d51	Merge branch 'feat-sites' into chore-add-site-domains-var	2024-11-20 14:13:39 +01:00
Matej Bačo	2e9e6d38e2	Fix site URLs	2024-11-20 13:48:42 +01:00
Matej Bačo	53917d6d90	Update specs	2024-11-20 12:25:28 +01:00
Matej Bačo	d20714eed6	Merge branch 'feat-sites' into chore-add-site-domains-var	2024-11-20 12:21:13 +01:00
Matej Bačo	2f328bf4cf	Fix double rule IDs	2024-11-20 12:20:29 +01:00
Matej Bačo	e3c4cdb040	Update template-runtimes.php	2024-11-20 12:10:09 +01:00
Matej Bačo	c8cf645414	Merge branch '1.6.x' into feat-sites	2024-11-20 12:07:13 +01:00
Khushboo Verma	aa47d9f07a	Add _APP_OPTIONS_FORCE_HTTPS to console vars	2024-11-20 16:12:35 +05:30
Khushboo Verma	338559967a	Update var count in tests	2024-11-20 14:52:03 +05:30
Khushboo Verma	a736a42e26	Update test	2024-11-20 14:46:04 +05:30
Khushboo Verma	00c6549610	Add _APP_DOMAIN_SITES to console variables	2024-11-20 14:44:22 +05:30
Matej BačoandGitHub	510d871379	Merge pull request #9001 from appwrite/chore-move-preview-url-to-create-deployment Create preview url rule when deployment is created	2024-11-20 09:52:03 +01:00
Khushboo Verma	43e2d7454a	Create preview url rule when deployment is created	2024-11-18 20:27:07 +05:30
Khushboo Verma	cb359e40ba	Add fallbackFile for SPA	2024-11-18 00:23:45 +05:30
Khushboo Verma	2ad0428727	Merge 1.6.x into feat-sites	2024-11-13 13:18:21 +05:30
Matej BačoandGitHub	6874b4f6fb	Merge pull request #8885 from appwrite/feat-add-sites-comments Feat add sites comments	2024-10-28 15:47:16 +01:00
Matej BačoandGitHub	eeba650f6c	Merge branch 'feat-sites' into feat-add-sites-comments	2024-10-28 15:43:46 +01:00
Matej Bačo	54b07e6b99	Add protocol	2024-10-28 15:24:34 +01:00
Khushboo Verma	dc8b9478ee	Fix builds	2024-10-28 15:20:36 +01:00
Torsten DittmannandGitHub	d97b02add9	Merge pull request #8884 from appwrite/fix-sites-get-template Fix: sites get template missing key	2024-10-28 15:07:10 +01:00
Matej Bačo	8427ade0fa	Fix sites get template missing key	2024-10-28 15:04:48 +01:00
Khushboo Verma	44d6a0dea1	Merge branch 'feat-add-sites-comments' of github.com:appwrite/appwrite into feat-add-sites-comments	2024-10-28 15:02:00 +01:00
Khushboo Verma	f710ce266b	Merge branch 'feat-sites' into feat-add-sites-comments	2024-10-28 14:54:08 +01:00
Matej Bačo	45dc9a39d9	Get preview URL	2024-10-28 14:53:06 +01:00
Matej Bačo	d703a118c4	Merge branch 'feat-sites' into feat-add-sites-comments	2024-10-28 14:52:07 +01:00
Matej Bačo	c20e580a9e	Fix missing params in VCS comment flow	2024-10-28 14:45:18 +01:00
Matej Bačo	9b4de5d7bf	Fix comments	2024-10-28 14:39:12 +01:00
Matej BačoandGitHub	7c9f396b40	Merge pull request #8883 from appwrite/feat-sites-logs-styled Feat: Styled&timestamped logs	2024-10-28 14:35:30 +01:00
Matej Bačo	31b9f2b4f9	Fix comments	2024-10-28 14:19:44 +01:00
Khushboo Verma	6ff15f9b53	WIP: GitHub Comments for Sites	2024-10-28 14:00:23 +01:00
Matej BačoandGitHub	1ebd6c252c	Merge branch 'feat-sites' into feat-sites-logs-styled	2024-10-28 12:27:06 +01:00
Matej BačoandGitHub	8424351d49	Merge pull request #8882 from appwrite/fix-sites-logs-realtime Fix: sites deployment logs realtime	2024-10-28 12:26:54 +01:00
Matej Bačo	0c4e597819	Implemented styled and timestamped logs, fix cosistency	2024-10-28 12:22:34 +01:00
Matej BačoandGitHub	d1917d1a2b	Merge branch 'feat-sites' into fix-sites-logs-realtime	2024-10-28 12:08:27 +01:00
Matej Bačo	bb3503f0c4	Fix sites deployment logs realtime	2024-10-28 12:00:06 +01:00
Torsten DittmannandGitHub	7c22776254	Merge pull request #8880 from appwrite/fix-deployment-domains Fix: deployment domain incorrect	2024-10-28 11:59:21 +01:00
Matej BačoandGitHub	2294586371	Merge branch 'feat-sites' into fix-deployment-domains	2024-10-28 11:21:08 +01:00
Torsten DittmannandGitHub	b7f519f86e	Merge pull request #8879 from appwrite/fix-check-domain-availability Throw exception for error	2024-10-28 11:19:04 +01:00
Matej Bačo	febd5294f4	Ensure function executor is ready	2024-10-28 11:18:15 +01:00
Matej Bačo	690a23fe89	Fix deployments showing wrong domains	2024-10-28 11:17:44 +01:00
Khushboo Verma	39c1a88dae	Throw exception for error	2024-10-28 10:55:58 +01:00
Khushboo VermaandGitHub	d0808e0c1a	Merge pull request #8878 from appwrite/fix-sites-notice Fix: unwanted notice	2024-10-27 22:11:50 +01:00
Matej Bačo	34fd22e4e9	Fix unwanted object instead of array	2024-10-27 21:49:44 +01:00
Matej Bačo	d4fb0d37c2	Fix notice	2024-10-27 21:44:59 +01:00
Matej BačoandGitHub	fd02ca00f0	Merge pull request #8877 from appwrite/feat-preview-deployments Feat: Implement preview deployments	2024-10-27 21:25:27 +01:00
Matej Bačo	8a53d02d0c	Remove leftover	2024-10-27 21:25:12 +01:00
Matej Bačo	58ee53876b	Implement preview deployments	2024-10-27 21:10:53 +01:00
Matej BačoandGitHub	853b730def	Merge pull request #8875 from appwrite/chore-add-build-runtime Add build and serve runtime to updateSite	2024-10-27 19:17:13 +01:00
Khushboo Verma	be5fdbfd4f	Add build and serve runtime to updateSite	2024-10-27 18:54:20 +01:00
Khushboo VermaandGitHub	e6d123b5e8	Merge pull request #8873 from appwrite/chore-rename-common-vars-to-compute Use compute vars for functions and sites	2024-10-27 18:35:27 +01:00
Khushboo Verma	d8a844a2f9	Fix functions tests	2024-10-27 18:14:47 +01:00
Khushboo Verma	dd87cdbebf	Fix remaining vars	2024-10-27 18:04:40 +01:00
Khushboo Verma	4c1881324e	Use compute vars for functions and sites	2024-10-27 17:22:45 +01:00
Matej BačoandGitHub	bd27a36d16	Merge pull request #8872 from appwrite/fix-site-leftovers Fix: leftover structure	2024-10-27 16:58:12 +01:00
Matej Bačo	2f999ba3db	Fix crashing containers	2024-10-27 16:34:49 +01:00
Matej Bačo	d8ec390cd6	Merge branch 'feat-sites' into fix-site-leftovers	2024-10-27 16:22:53 +01:00
Matej Bačo	7a0e7bfb95	Add runtimes to templates	2024-10-27 16:15:49 +01:00
Khushboo VermaandGitHub	da7ae6b953	Merge pull request #8863 from appwrite/feat-sites-endpoints Add timeout and add sites scopes	2024-10-27 16:15:00 +01:00
Khushboo Verma	2dead545f0	Resolve PR comments	2024-10-27 15:51:17 +01:00
Matej Bačo	9c566ec17c	Merge branch 'feat-sites' into fix-site-leftovers	2024-10-27 15:49:53 +01:00
Matej Bačo	385fe303cc	Fix leftover fields and attributes	2024-10-27 15:48:39 +01:00
Khushboo Verma	81e3709d25	Remove scopes from updateSite endpoint	2024-10-27 15:48:06 +01:00
Khushboo Verma	7f17efcdd8	Resolve merge conflicts	2024-10-27 15:43:52 +01:00
Khushboo VermaandGitHub	a566ac1078	Merge pull request #8865 from appwrite/feat-check-domain-availability Add custom domain param in create site endpoint	2024-10-27 15:38:14 +01:00
Khushboo Verma	44e76b4eaa	Add a todo	2024-10-27 15:35:18 +01:00
Khushboo Verma	e7e1cfa12e	Update desc	2024-10-27 15:32:29 +01:00
Khushboo Verma	77a70cad71	Add endpoint to check subdomain availability	2024-10-27 15:31:00 +01:00
Khushboo Verma	0c2db53ee8	Address PR Comments	2024-10-27 14:11:53 +01:00
Khushboo Verma	83807ed247	Fix projects tests	2024-10-27 12:56:56 +01:00
Khushboo Verma	302a135e5a	Fix health tests	2024-10-27 11:52:22 +01:00
Khushboo Verma	6b2160f388	Fix vcs deployments	2024-10-27 11:33:56 +01:00
Khushboo Verma	86a68c50bc	Rename subdomain	2024-10-27 11:32:43 +01:00
Khushboo Verma	e2e7d6578c	Resolve merge conflicts	2024-10-27 11:30:17 +01:00
Matej BačoandGitHub	a171e17666	Merge pull request #8860 from appwrite/feat-sites-static Feat: Static sites	2024-10-26 21:26:48 +02:00
Matej Bačo	d8610e0f2a	Upgrade executor to fix tests	2024-10-26 18:57:37 +00:00
Matej Bačo	93222bf3f9	Fix response format; formatting	2024-10-26 20:47:43 +02:00
Matej Bačo	ea6765c68a	Support static sites	2024-10-26 18:43:30 +02:00
Khushboo Verma	6ac81dea19	Check if subdomain exists before creating site	2024-10-26 18:34:58 +02:00
Khushboo Verma	e4dd9bc9f9	Use custom domain in create site endpoint	2024-10-26 17:07:15 +02:00
Khushboo Verma	03d4d4c8fa	Add build env vars for sites	2024-10-26 12:29:42 +02:00
Khushboo Verma	fcc51d3352	Add sites build timeout env var	2024-10-26 11:14:55 +02:00
Khushboo Verma	08630cd686	Add timeout and add sites scopes	2024-10-26 11:01:14 +02:00
Matej Bačo	9295a4e7ce	Update depenrencies	2024-10-25 19:25:51 +02:00
Matej BačoandGitHub	826a1a02a2	Merge pull request #8844 from appwrite/feat-site-endpointsa Add new endpoints in HTTP structure	2024-10-25 18:46:11 +02:00
Khushboo Verma	4ed08cefa7	Fix getTemplate endpoint	2024-10-25 18:04:32 +02:00
Khushboo Verma	1a33a0c4d1	Fix range and frameworks	2024-10-25 16:23:29 +02:00
Khushboo Verma	4d3d710211	Add missing group to templates API	2024-10-25 16:05:45 +02:00
Khushboo Verma	ac93e70dd2	Update listframeworks endpoint	2024-10-25 15:56:28 +02:00
Khushboo Verma	dd3ffbb391	Add getTemplate endpoint for sites	2024-10-25 14:55:09 +02:00
Khushboo Verma	9d1d101586	Update VCS endpoin to work for both functions and sites	2024-10-25 14:41:14 +02:00
Khushboo VermaandGitHub	32da7b8fe2	Merge pull request #8852 from appwrite/fix-sites-commands-and-hardcoded fix: commands and todos	2024-10-25 11:59:02 +02:00
Torsten Dittmann	41484113a0	chore: add comments	2024-10-25 10:55:31 +02:00
Torsten Dittmann	5d6a8be66d	fix: function command	2024-10-24 19:43:12 +02:00
Torsten Dittmann	aba3a31663	fix: deployment/deploymentId	2024-10-24 19:28:20 +02:00
Torsten Dittmann	8950f71b0a	revert: comments	2024-10-24 19:24:24 +02:00
Torsten Dittmann	54d3668693	fix: todos for sites	2024-10-24 19:20:00 +02:00
Khushboo Verma	b16169f867	Add secret to templateVariable model	2024-10-24 18:09:43 +02:00
Khushboo Verma	bbd589f6a8	Add download build endpoint to sites	2024-10-24 18:02:26 +02:00
Khushboo Verma	765d8241f2	Add secret param to site variables	2024-10-24 16:32:53 +02:00
Khushboo Verma	8e041ddeb6	Merge branch 'feat-sites' into feat-site-endpointsa	2024-10-24 15:24:37 +02:00
Khushboo Verma	a4a7fe0c48	Merge branch '1.7.x' into feat-sites	2024-10-24 15:24:25 +02:00
Khushboo Verma	a247fc3b48	Merge branch 'feat-site-endpointsa' of github.com:appwrite/appwrite into feat-site-endpointsa	2024-10-24 15:22:16 +02:00
Khushboo Verma	d876085f6d	Add usage endpoints	2024-10-24 15:21:40 +02:00
Torsten DittmannandGitHub	bba9c3d57a	Merge pull request #8831 from appwrite/feat-add-secret-environment-vars Add secret attribute to variables	2024-10-24 12:53:10 +02:00
Khushboo VermaandGitHub	944e971124	Merge pull request #8849 from appwrite/feat-site-static-runtime feat: static runtime	2024-10-24 12:38:57 +02:00
Torsten Dittmann	e512ab1816	Merge branch 'feat-site-static-runtime' of https://github.com/appwrite/appwrite into feat-site-static-runtime	2024-10-24 12:19:19 +02:00
Torsten Dittmann	83b5aecbfd	chore: add todo comment	2024-10-24 12:19:10 +02:00
Khushboo Verma	2f9d00fc07	Update the description for secret var	2024-10-24 12:08:33 +02:00
Khushboo VermaandGitHub	23b57692ec	Merge branch 'feat-site-endpointsa' into feat-site-static-runtime	2024-10-24 12:06:02 +02:00
Khushboo Verma	8bda7f1e1e	Add listSiteTemplates endpoint and response models	2024-10-24 11:47:09 +02:00
Khushboo Verma	12bddc3b1f	Change secret type to bool	2024-10-24 10:59:47 +02:00
Khushboo Verma	8f5fa84996	Add variable endpoints for sites	2024-10-24 10:49:43 +02:00
Khushboo VermaandGitHub	3af34f078c	Merge branch 'feat-site-endpointsa' into feat-site-static-runtime	2024-10-23 18:37:45 +02:00
Torsten Dittmann	57e596fea2	feat: static runtime for site	2024-10-23 18:36:26 +02:00
Khushboo Verma	9793cf4ece	Add all deployment endpoints for sites	2024-10-23 17:07:28 +02:00
Khushboo Verma	a4bdc23aef	Add more endpoints and models for sites	2024-10-23 12:19:07 +02:00
Khushboo Verma	4240089d41	Add create deployment endpoint	2024-10-22 19:45:49 +02:00
Khushboo VermaandGitHub	09ebfac307	Merge pull request #8843 from appwrite/fix-builds-worker fix: builds worker new structure	2024-10-22 18:57:37 +02:00
Torsten Dittmann	89b6291488	fix: khusboo review comments	2024-10-22 18:56:34 +02:00
Torsten Dittmann	1434b6bbff	fix: builds worker new structure	2024-10-22 18:03:40 +02:00
Torsten DittmannandGitHub	de164ff936	Merge pull request #8842 from appwrite/fix-workers Fix workers	2024-10-22 17:37:01 +02:00
Torsten Dittmann	a8e2fb1ee5	Merge branch 'feat-sites' of https://github.com/appwrite/appwrite into fix-workers	2024-10-22 17:35:54 +02:00
Torsten Dittmann	7da8b44c63	chore: run formatter	2024-10-22 17:35:24 +02:00
Torsten Dittmann	8f0c1a4224	fix: gitignore	2024-10-22 17:34:22 +02:00
Torsten Dittmann	c57cb3d2d9	fix: workers	2024-10-22 17:33:33 +02:00
Torsten DittmannandGitHub	5172189e36	Merge pull request #8839 from appwrite/feat-add-sites-endpoints Move functions endpoints to modules	2024-10-22 17:31:43 +02:00
Khushboo Verma	6c6723e181	Refactor callback	2024-10-22 17:10:50 +02:00
Khushboo Verma	5b0a05b4b3	Create site endpoint working	2024-10-22 17:01:38 +02:00
Khushboo Verma	87cbd8fbf3	Move create function, create deployment to modules	2024-10-22 13:00:10 +02:00
Torsten DittmannandGitHub	9060250806	Merge pull request #8832 from appwrite/feat-add-sites-collection Add new collection	2024-10-21 19:08:34 +02:00
Khushboo Verma	bc63c3b383	Add sites collection	2024-10-21 19:01:37 +02:00
Khushboo Verma	a503803725	Add secret attribute to variables	2024-10-21 16:33:57 +02:00