default spec

Merge branch '1.6.x' of github.com:appwrite/appwrite into feat-custom-cf-hostnames
Merge remote-tracking branch 'origin/1.6.x' into feat-custom-cf-hostnames
2026-05-26 13:51:13 +00:00 · 2024-11-22 17:18:19 +00:00 · 2024-11-22 12:42:38 +04:00 · 2024-11-21 22:44:24 +13:00 · 2024-11-21 14:25:14 +13:00 · 2024-11-21 14:20:28 +13:00
614 changed files with 23359 additions and 73046 deletions
@@ -23,7 +23,6 @@ _APP_OPENSSL_KEY_V1=your-secret-key
 _APP_DOMAIN=traefik
 _APP_DOMAIN_FUNCTIONS=functions.localhost
 _APP_DOMAIN_TARGET=localhost
-_APP_RULES_FORMAT=md5
 _APP_REDIS_HOST=redis
 _APP_REDIS_PORT=6379
 _APP_REDIS_PASS=
@@ -109,7 +108,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_SLOW_QUERIES_MAX_HITS=5
-_APP_SLOW_QUERIES_TIMEOUT=15000
-_APP_SLOW_QUERIES_BLOCK=enabled
@@ -175,8 +175,6 @@ jobs:
    name: Benchmark
    runs-on: ubuntu-latest
    needs: setup
-    permissions:
-      pull-requests: write
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
@@ -237,7 +235,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:
@@ -245,10 +242,9 @@ 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 }}
          issue-number: ${{ github.event.pull_request.number }}
          body-path: benchmark.txt
-          edit-mode: replace
+          edit-mode: replace
@@ -16,4 +16,4 @@ dev/yasd_init.php
 .phpunit.result.cache
 Makefile
 appwrite.json
-/.zed/
+/.zed/
@@ -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
@@ -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:
@@ -67,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.1
+    appwrite/appwrite:1.6.0
 ```

 ### Windows
@@ -79,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.1
+    appwrite/appwrite:1.6.0
 ```

 #### PowerShell
@@ -89,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.1
+    appwrite/appwrite:1.6.0
 ```

 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。
@@ -75,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.1
+    appwrite/appwrite:1.6.0
 ```

 ### Windows
@@ -87,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.1
+    appwrite/appwrite:1.6.0
 ```

 #### PowerShell
@@ -97,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.1
+    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.
@@ -52,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;
@@ -67,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');
@@ -78,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.');
            }

@@ -94,15 +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('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 {
@@ -158,7 +158,7 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform

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

 CLI::setResource('queue', function (Group $pools) {
    return $pools->get('queue')->pop()->getResource();
@@ -181,7 +181,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());
@@ -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],
-            ],
-        ],
-    ]
-];
@@ -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.',
@@ -726,11 +731,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 => [
@@ -1023,16 +1023,4 @@ return [
        'description' => 'Target has an invalid provider type.',
        'code' => 400,
    ],
-
-    /* Slow queries */
-    Exception::QUERY_BLOCKED => [
-        'name' => Exception::QUERY_BLOCKED,
-        'description' => 'Request blocked after exceeding the maximum number of timeouts',
-        'code' => 403,
-    ],
-    Exception::QUERY_TIMEOUT => [
-        'name' => Exception::QUERY_TIMEOUT,
-        'description' => 'Request timed out, this query will be blocked if it keeps timing out, try adjusting the "queries" parameter or adding indexes for the queried attributes.',
-        'code' => 408,
-    ],
 ];
@@ -1567,8 +1567,7 @@ return [
                'required' => false,
                'type' => 'number'
            ]
-        ],
-        'scopes' => []
+        ]
    ],
    [
        'icon' => 'icon-chip',
@@ -11,7 +11,7 @@ return [
            [
                'key' => 'web',
                'name' => 'Web',
-                'version' => '16.1.0',
+                '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' => '13.1.1',
+                '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' => '7.1.0',
+                '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' => '6.1.0',
+                '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.6.0',
+                '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.0',
+                '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' => '14.2.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' => '12.2.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' => '12.2.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' => '6.2.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' => '12.2.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.3.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.11.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' => '12.2.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' => '6.2.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' => '6.2.0',
+                'version' => '6.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-swift',
                'package' => 'https://github.com/appwrite/sdk-for-swift',
                'enabled' => true,
@@ -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,
@@ -1,7 +1,7 @@
 {
    "openapi": "3.0.0",
    "info": {
-        "version": "1.6.1",
+        "version": "1.6.0",
        "title": "Appwrite",
        "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
        "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -58,6 +58,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -106,6 +109,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -190,6 +196,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -265,6 +274,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/identities",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -323,6 +335,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -385,6 +400,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -433,6 +451,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -498,6 +519,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -567,6 +591,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -632,6 +659,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -709,6 +739,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -776,6 +809,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -821,10 +857,10 @@
                ],
                "description": "Complete the MFA challenge by providing the one-time password. Finish the process of MFA verification by providing the one-time password. To begin the flow, use [createMfaChallenge](\/docs\/references\/cloud\/client-web\/account#createMfaChallenge) method.",
                "responses": {
-                    "200": {
-                        "description": "Session",
+                    "204": {
+                        "description": "No content",
                        "content": {
-                            "application\/json": {
+                            "": {
                                "schema": {
                                    "$ref": "#\/components\/schemas\/session"
                                }
@@ -849,6 +885,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -924,6 +963,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -974,6 +1016,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1022,6 +1067,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1070,6 +1118,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1120,6 +1171,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1189,6 +1243,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1263,6 +1320,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1338,6 +1398,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/prefs",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1386,6 +1449,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/prefs",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1458,6 +1524,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1531,6 +1600,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1612,6 +1684,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/sessions",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1653,6 +1728,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1703,6 +1781,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1751,6 +1832,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1824,6 +1908,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1890,6 +1977,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2030,6 +2120,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2103,6 +2196,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2176,6 +2272,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/sessions",
+                    "offline-key": "{sessionId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2236,6 +2335,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2289,6 +2391,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2351,6 +2456,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2371,7 +2479,7 @@
                "tags": [
                    "account"
                ],
-                "description": "Use this endpoint to register a device for push notifications. Provide a target ID (custom or generated using ID.unique()), a device identifier (usually a device token), and optionally specify which provider should send notifications to this target. The target is automatically linked to the current session and includes device information like brand and model.",
+                "description": "",
                "responses": {
                    "201": {
                        "description": "Target",
@@ -2391,7 +2499,7 @@
                    "type": "",
                    "deprecated": false,
                    "demo": "account\/create-push-target.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/account\/create-push-target.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -2400,6 +2508,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2449,7 +2560,7 @@
                "tags": [
                    "account"
                ],
-                "description": "Update the currently logged in user's push notification target. You can modify the target's identifier (device token) and provider ID (token, email, phone etc.). The target must exist and belong to the current user. If you change the provider ID, notifications will be sent through the new messaging provider instead.",
+                "description": "",
                "responses": {
                    "200": {
                        "description": "Target",
@@ -2469,7 +2580,7 @@
                    "type": "",
                    "deprecated": false,
                    "demo": "account\/update-push-target.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/account\/update-push-target.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -2478,6 +2589,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2526,10 +2640,17 @@
                "tags": [
                    "account"
                ],
-                "description": "Delete a push notification target for the currently logged in user. After deletion, the device will no longer receive push notifications. The target must exist and belong to the current user.",
+                "description": "",
                "responses": {
                    "204": {
-                        "description": "No content"
+                        "description": "No content",
+                        "content": {
+                            "application\/json": {
+                                "schema": {
+                                    "$ref": "#\/components\/schemas\/target"
+                                }
+                            }
+                        }
                    }
                },
                "x-appwrite": {
@@ -2539,7 +2660,7 @@
                    "type": "",
                    "deprecated": false,
                    "demo": "account\/delete-push-target.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/account\/delete-push-target.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -2548,6 +2669,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2609,6 +2733,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2657,7 +2784,7 @@
                "tags": [
                    "account"
                ],
-                "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
+                "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour. If you are on a mobile device you can leave the URL parameter empty, so that the login completion will be handled by your Appwrite instance by default.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
                "responses": {
                    "201": {
                        "description": "Token",
@@ -2690,6 +2817,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2766,6 +2896,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2909,6 +3042,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2982,6 +3118,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3049,6 +3188,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3127,6 +3269,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3175,6 +3320,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3244,6 +3392,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3369,6 +3520,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3498,6 +3652,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3555,6 +3712,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4042,6 +4202,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4123,6 +4286,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4214,6 +4380,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4312,6 +4481,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4396,6 +4568,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "{documentId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4502,6 +4677,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "{documentId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4596,6 +4774,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "{documentId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4694,6 +4875,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "{documentId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4777,6 +4961,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4862,6 +5049,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4976,6 +5166,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5049,6 +5242,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5100,6 +5296,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5151,6 +5350,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/localed",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5202,6 +5404,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/localeCode",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5253,6 +5458,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/continents",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5304,6 +5512,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/countries",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5355,6 +5566,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/countries\/eu",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5406,6 +5620,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/countries\/phones",
+                    "offline-key": "",
+                    "offline-response-key": "countryCode",
                    "auth": {
                        "Project": []
                    }
@@ -5457,6 +5674,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/currencies",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5508,6 +5728,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/languages",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5543,7 +5766,7 @@
                },
                "x-appwrite": {
                    "method": "createSubscriber",
-                    "weight": 376,
+                    "weight": 382,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5560,6 +5783,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5625,7 +5851,7 @@
                },
                "x-appwrite": {
                    "method": "deleteSubscriber",
-                    "weight": 380,
+                    "weight": 386,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5642,6 +5868,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5715,6 +5944,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5800,6 +6032,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5897,6 +6132,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5968,6 +6206,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6056,6 +6297,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6122,6 +6366,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6188,6 +6435,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6361,7 +6611,6 @@
                                "gif",
                                "png",
                                "webp",
-                                "heic",
                                "avif"
                            ],
                            "x-enum-name": "ImageFormat",
@@ -6404,6 +6653,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6477,6 +6729,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6552,6 +6807,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6636,6 +6894,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams",
+                    "offline-key": "{teamId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6697,6 +6958,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams",
+                    "offline-key": "{teamId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6770,6 +7034,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6833,6 +7100,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams\/{teamId}\/memberships",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6918,6 +7188,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7028,6 +7301,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams\/{teamId}\/memberships",
+                    "offline-key": "{membershipId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7099,6 +7375,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7185,6 +7464,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7257,6 +7539,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7354,6 +7639,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams\/{teamId}\/prefs",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7414,6 +7702,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams\/{teamId}\/prefs",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1,7 +1,7 @@
 {
    "openapi": "3.0.0",
    "info": {
-        "version": "1.6.1",
+        "version": "1.6.0",
        "title": "Appwrite",
        "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
        "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -58,6 +58,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -106,6 +109,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -190,6 +196,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -265,6 +274,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/identities",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -323,6 +335,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -385,6 +400,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -433,6 +451,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -498,6 +519,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -567,6 +591,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -632,6 +659,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -709,6 +739,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -776,6 +809,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -821,10 +857,10 @@
                ],
                "description": "Complete the MFA challenge by providing the one-time password. Finish the process of MFA verification by providing the one-time password. To begin the flow, use [createMfaChallenge](\/docs\/references\/cloud\/client-web\/account#createMfaChallenge) method.",
                "responses": {
-                    "200": {
-                        "description": "Session",
+                    "204": {
+                        "description": "No content",
                        "content": {
-                            "application\/json": {
+                            "": {
                                "schema": {
                                    "$ref": "#\/components\/schemas\/session"
                                }
@@ -849,6 +885,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -924,6 +963,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -974,6 +1016,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1022,6 +1067,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1070,6 +1118,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1120,6 +1171,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1189,6 +1243,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1263,6 +1320,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1338,6 +1398,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/prefs",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1386,6 +1449,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/prefs",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1458,6 +1524,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1531,6 +1600,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1612,6 +1684,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/sessions",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1653,6 +1728,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1703,6 +1781,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1751,6 +1832,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1824,6 +1908,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1890,6 +1977,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2030,6 +2120,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2103,6 +2196,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2176,6 +2272,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/sessions",
+                    "offline-key": "{sessionId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2236,6 +2335,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2289,6 +2391,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2351,6 +2456,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2371,7 +2479,7 @@
                "tags": [
                    "account"
                ],
-                "description": "Use this endpoint to register a device for push notifications. Provide a target ID (custom or generated using ID.unique()), a device identifier (usually a device token), and optionally specify which provider should send notifications to this target. The target is automatically linked to the current session and includes device information like brand and model.",
+                "description": "",
                "responses": {
                    "201": {
                        "description": "Target",
@@ -2391,7 +2499,7 @@
                    "type": "",
                    "deprecated": false,
                    "demo": "account\/create-push-target.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/account\/create-push-target.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -2400,6 +2508,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2449,7 +2560,7 @@
                "tags": [
                    "account"
                ],
-                "description": "Update the currently logged in user's push notification target. You can modify the target's identifier (device token) and provider ID (token, email, phone etc.). The target must exist and belong to the current user. If you change the provider ID, notifications will be sent through the new messaging provider instead.",
+                "description": "",
                "responses": {
                    "200": {
                        "description": "Target",
@@ -2469,7 +2580,7 @@
                    "type": "",
                    "deprecated": false,
                    "demo": "account\/update-push-target.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/account\/update-push-target.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -2478,6 +2589,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2526,10 +2640,17 @@
                "tags": [
                    "account"
                ],
-                "description": "Delete a push notification target for the currently logged in user. After deletion, the device will no longer receive push notifications. The target must exist and belong to the current user.",
+                "description": "",
                "responses": {
                    "204": {
-                        "description": "No content"
+                        "description": "No content",
+                        "content": {
+                            "application\/json": {
+                                "schema": {
+                                    "$ref": "#\/components\/schemas\/target"
+                                }
+                            }
+                        }
                    }
                },
                "x-appwrite": {
@@ -2539,7 +2660,7 @@
                    "type": "",
                    "deprecated": false,
                    "demo": "account\/delete-push-target.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/account\/delete-push-target.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -2548,6 +2669,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2609,6 +2733,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2690,6 +2817,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2766,6 +2896,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2909,6 +3042,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2982,6 +3118,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3049,6 +3188,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3127,6 +3269,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3175,6 +3320,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3244,6 +3392,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3369,6 +3520,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3498,6 +3652,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3555,6 +3712,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4042,6 +4202,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4123,6 +4286,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4214,6 +4380,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4312,6 +4481,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4396,6 +4568,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "{documentId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4502,6 +4677,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "{documentId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4596,6 +4774,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "{documentId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4694,6 +4875,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "{documentId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4777,6 +4961,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4862,6 +5049,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4976,6 +5166,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5049,6 +5242,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5100,6 +5296,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5151,6 +5350,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/localed",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5202,6 +5404,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/localeCode",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5253,6 +5458,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/continents",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5304,6 +5512,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/countries",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5355,6 +5566,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/countries\/eu",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5406,6 +5620,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/countries\/phones",
+                    "offline-key": "",
+                    "offline-response-key": "countryCode",
                    "auth": {
                        "Project": []
                    }
@@ -5457,6 +5674,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/currencies",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5508,6 +5728,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/languages",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5543,7 +5766,7 @@
                },
                "x-appwrite": {
                    "method": "createSubscriber",
-                    "weight": 376,
+                    "weight": 382,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5560,6 +5783,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5625,7 +5851,7 @@
                },
                "x-appwrite": {
                    "method": "deleteSubscriber",
-                    "weight": 380,
+                    "weight": 386,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5642,6 +5868,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5715,6 +5944,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5800,6 +6032,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5897,6 +6132,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5968,6 +6206,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6056,6 +6297,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6122,6 +6366,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6188,6 +6435,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6361,7 +6611,6 @@
                                "gif",
                                "png",
                                "webp",
-                                "heic",
                                "avif"
                            ],
                            "x-enum-name": "ImageFormat",
@@ -6404,6 +6653,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6477,6 +6729,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6552,6 +6807,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6636,6 +6894,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams",
+                    "offline-key": "{teamId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6697,6 +6958,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams",
+                    "offline-key": "{teamId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6770,6 +7034,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6833,6 +7100,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams\/{teamId}\/memberships",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6918,6 +7188,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7028,6 +7301,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams\/{teamId}\/memberships",
+                    "offline-key": "{membershipId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7099,6 +7375,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7185,6 +7464,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7257,6 +7539,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7354,6 +7639,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams\/{teamId}\/prefs",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7414,6 +7702,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams\/{teamId}\/prefs",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1,7 +1,7 @@
 {
    "swagger": "2.0",
    "info": {
-        "version": "1.6.1",
+        "version": "1.6.0",
        "title": "Appwrite",
        "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
        "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -102,6 +102,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -152,6 +155,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -242,6 +248,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -321,6 +330,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/identities",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -382,6 +394,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -444,6 +459,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -494,6 +512,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -560,6 +581,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -632,6 +656,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -697,6 +724,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -775,6 +805,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -842,6 +875,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -886,19 +922,14 @@
                "consumes": [
                    "application\/json"
                ],
-                "produces": [
-                    "application\/json"
-                ],
+                "produces": [],
                "tags": [
                    "account"
                ],
                "description": "Complete the MFA challenge by providing the one-time password. Finish the process of MFA verification by providing the one-time password. To begin the flow, use [createMfaChallenge](\/docs\/references\/cloud\/client-web\/account#createMfaChallenge) method.",
                "responses": {
-                    "200": {
-                        "description": "Session",
-                        "schema": {
-                            "$ref": "#\/definitions\/session"
-                        }
+                    "204": {
+                        "description": "No content"
                    }
                },
                "x-appwrite": {
@@ -918,6 +949,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -997,6 +1031,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1049,6 +1086,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1099,6 +1139,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1149,6 +1192,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1201,6 +1247,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1273,6 +1322,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1351,6 +1403,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1430,6 +1485,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/prefs",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1480,6 +1538,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/prefs",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1555,6 +1616,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1632,6 +1696,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1718,6 +1785,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/sessions",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1763,6 +1833,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1815,6 +1888,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1865,6 +1941,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1942,6 +2021,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2016,6 +2098,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2151,6 +2236,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2228,6 +2316,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2305,6 +2396,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/sessions",
+                    "offline-key": "{sessionId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2365,6 +2459,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2420,6 +2517,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2482,6 +2582,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2508,7 +2611,7 @@
                "tags": [
                    "account"
                ],
-                "description": "Use this endpoint to register a device for push notifications. Provide a target ID (custom or generated using ID.unique()), a device identifier (usually a device token), and optionally specify which provider should send notifications to this target. The target is automatically linked to the current session and includes device information like brand and model.",
+                "description": "",
                "responses": {
                    "201": {
                        "description": "Target",
@@ -2524,7 +2627,7 @@
                    "type": "",
                    "deprecated": false,
                    "demo": "account\/create-push-target.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/account\/create-push-target.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -2533,6 +2636,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2591,7 +2697,7 @@
                "tags": [
                    "account"
                ],
-                "description": "Update the currently logged in user's push notification target. You can modify the target's identifier (device token) and provider ID (token, email, phone etc.). The target must exist and belong to the current user. If you change the provider ID, notifications will be sent through the new messaging provider instead.",
+                "description": "",
                "responses": {
                    "200": {
                        "description": "Target",
@@ -2607,7 +2713,7 @@
                    "type": "",
                    "deprecated": false,
                    "demo": "account\/update-push-target.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/account\/update-push-target.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -2616,6 +2722,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2661,11 +2770,13 @@
                "consumes": [
                    "application\/json"
                ],
-                "produces": [],
+                "produces": [
+                    "application\/json"
+                ],
                "tags": [
                    "account"
                ],
-                "description": "Delete a push notification target for the currently logged in user. After deletion, the device will no longer receive push notifications. The target must exist and belong to the current user.",
+                "description": "",
                "responses": {
                    "204": {
                        "description": "No content"
@@ -2678,7 +2789,7 @@
                    "type": "",
                    "deprecated": false,
                    "demo": "account\/delete-push-target.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/account\/delete-push-target.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -2687,6 +2798,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2748,6 +2862,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2805,7 +2922,7 @@
                "tags": [
                    "account"
                ],
-                "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
+                "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour. If you are on a mobile device you can leave the URL parameter empty, so that the login completion will be handled by your Appwrite instance by default.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
                "responses": {
                    "201": {
                        "description": "Token",
@@ -2834,6 +2951,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2920,6 +3040,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3058,6 +3181,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3135,6 +3261,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3205,6 +3334,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3287,6 +3419,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3337,6 +3472,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3417,6 +3555,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3543,6 +3684,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3673,6 +3817,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3737,6 +3884,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4225,6 +4375,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4309,6 +4462,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4401,6 +4557,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4493,6 +4652,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4574,6 +4736,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "{documentId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4679,6 +4844,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "{documentId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4768,6 +4936,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "{documentId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4864,6 +5035,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "{documentId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4943,6 +5117,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5025,6 +5202,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5143,6 +5323,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5214,6 +5397,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5287,6 +5473,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5360,6 +5549,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/localed",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5413,6 +5605,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/localeCode",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5466,6 +5661,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/continents",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5519,6 +5717,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/countries",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5572,6 +5773,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/countries\/eu",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5625,6 +5829,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/countries\/phones",
+                    "offline-key": "",
+                    "offline-response-key": "countryCode",
                    "auth": {
                        "Project": []
                    }
@@ -5678,6 +5885,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/currencies",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5731,6 +5941,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/languages",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5768,7 +5981,7 @@
                },
                "x-appwrite": {
                    "method": "createSubscriber",
-                    "weight": 376,
+                    "weight": 382,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5785,6 +5998,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5840,7 +6056,9 @@
                "consumes": [
                    "application\/json"
                ],
-                "produces": [],
+                "produces": [
+                    "application\/json"
+                ],
                "tags": [
                    "messaging"
                ],
@@ -5852,7 +6070,7 @@
                },
                "x-appwrite": {
                    "method": "deleteSubscriber",
-                    "weight": 380,
+                    "weight": 386,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5869,6 +6087,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5940,6 +6161,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6022,6 +6246,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6113,6 +6340,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6182,6 +6412,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6270,6 +6503,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6341,6 +6577,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6412,6 +6651,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6560,7 +6802,6 @@
                            "gif",
                            "png",
                            "webp",
-                            "heic",
                            "avif"
                        ],
                        "x-enum-name": "ImageFormat",
@@ -6611,6 +6852,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6682,6 +6926,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6756,6 +7003,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6847,6 +7097,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams",
+                    "offline-key": "{teamId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6908,6 +7161,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams",
+                    "offline-key": "{teamId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6982,6 +7238,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7045,6 +7304,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams\/{teamId}\/memberships",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7127,6 +7389,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7241,6 +7506,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams\/{teamId}\/memberships",
+                    "offline-key": "{membershipId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7310,6 +7578,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7395,6 +7666,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7465,6 +7739,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7560,6 +7837,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams\/{teamId}\/prefs",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7620,6 +7900,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams\/{teamId}\/prefs",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1,7 +1,7 @@
 {
    "swagger": "2.0",
    "info": {
-        "version": "1.6.1",
+        "version": "1.6.0",
        "title": "Appwrite",
        "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
        "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -102,6 +102,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -152,6 +155,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -242,6 +248,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -321,6 +330,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/identities",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -382,6 +394,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -444,6 +459,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -494,6 +512,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -560,6 +581,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -632,6 +656,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -697,6 +724,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -775,6 +805,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -842,6 +875,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -886,19 +922,14 @@
                "consumes": [
                    "application\/json"
                ],
-                "produces": [
-                    "application\/json"
-                ],
+                "produces": [],
                "tags": [
                    "account"
                ],
                "description": "Complete the MFA challenge by providing the one-time password. Finish the process of MFA verification by providing the one-time password. To begin the flow, use [createMfaChallenge](\/docs\/references\/cloud\/client-web\/account#createMfaChallenge) method.",
                "responses": {
-                    "200": {
-                        "description": "Session",
-                        "schema": {
-                            "$ref": "#\/definitions\/session"
-                        }
+                    "204": {
+                        "description": "No content"
                    }
                },
                "x-appwrite": {
@@ -918,6 +949,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -997,6 +1031,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1049,6 +1086,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1099,6 +1139,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1149,6 +1192,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1201,6 +1247,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1273,6 +1322,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1351,6 +1403,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1430,6 +1485,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/prefs",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1480,6 +1538,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/prefs",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1555,6 +1616,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1632,6 +1696,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1718,6 +1785,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/sessions",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1763,6 +1833,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1815,6 +1888,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1865,6 +1941,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1942,6 +2021,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2016,6 +2098,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2151,6 +2236,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2228,6 +2316,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2305,6 +2396,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/account\/sessions",
+                    "offline-key": "{sessionId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2365,6 +2459,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2420,6 +2517,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2482,6 +2582,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2508,7 +2611,7 @@
                "tags": [
                    "account"
                ],
-                "description": "Use this endpoint to register a device for push notifications. Provide a target ID (custom or generated using ID.unique()), a device identifier (usually a device token), and optionally specify which provider should send notifications to this target. The target is automatically linked to the current session and includes device information like brand and model.",
+                "description": "",
                "responses": {
                    "201": {
                        "description": "Target",
@@ -2524,7 +2627,7 @@
                    "type": "",
                    "deprecated": false,
                    "demo": "account\/create-push-target.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/account\/create-push-target.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -2533,6 +2636,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2591,7 +2697,7 @@
                "tags": [
                    "account"
                ],
-                "description": "Update the currently logged in user's push notification target. You can modify the target's identifier (device token) and provider ID (token, email, phone etc.). The target must exist and belong to the current user. If you change the provider ID, notifications will be sent through the new messaging provider instead.",
+                "description": "",
                "responses": {
                    "200": {
                        "description": "Target",
@@ -2607,7 +2713,7 @@
                    "type": "",
                    "deprecated": false,
                    "demo": "account\/update-push-target.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/account\/update-push-target.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -2616,6 +2722,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2661,11 +2770,13 @@
                "consumes": [
                    "application\/json"
                ],
-                "produces": [],
+                "produces": [
+                    "application\/json"
+                ],
                "tags": [
                    "account"
                ],
-                "description": "Delete a push notification target for the currently logged in user. After deletion, the device will no longer receive push notifications. The target must exist and belong to the current user.",
+                "description": "",
                "responses": {
                    "204": {
                        "description": "No content"
@@ -2678,7 +2789,7 @@
                    "type": "",
                    "deprecated": false,
                    "demo": "account\/delete-push-target.md",
-                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master\/docs\/references\/account\/delete-push-target.md",
+                    "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master",
                    "rate-limit": 0,
                    "rate-time": 3600,
                    "rate-key": "url:{url},ip:{ip}",
@@ -2687,6 +2798,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2748,6 +2862,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2834,6 +2951,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -2920,6 +3040,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3058,6 +3181,9 @@
                        "client"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3135,6 +3261,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3205,6 +3334,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3287,6 +3419,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3337,6 +3472,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3417,6 +3555,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3543,6 +3684,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3673,6 +3817,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -3737,6 +3884,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4225,6 +4375,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4309,6 +4462,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4401,6 +4557,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4493,6 +4652,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4574,6 +4736,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "{documentId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4679,6 +4844,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "{documentId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4768,6 +4936,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "{documentId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4864,6 +5035,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/databases\/{databaseId}\/collections\/{collectionId}\/documents",
+                    "offline-key": "{documentId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -4943,6 +5117,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5025,6 +5202,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5143,6 +5323,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5214,6 +5397,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5287,6 +5473,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5360,6 +5549,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/localed",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5413,6 +5605,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/localeCode",
+                    "offline-key": "current",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5466,6 +5661,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/continents",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5519,6 +5717,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/countries",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5572,6 +5773,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/countries\/eu",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5625,6 +5829,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/countries\/phones",
+                    "offline-key": "",
+                    "offline-response-key": "countryCode",
                    "auth": {
                        "Project": []
                    }
@@ -5678,6 +5885,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/currencies",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5731,6 +5941,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/locale\/languages",
+                    "offline-key": "",
+                    "offline-response-key": "code",
                    "auth": {
                        "Project": []
                    }
@@ -5768,7 +5981,7 @@
                },
                "x-appwrite": {
                    "method": "createSubscriber",
-                    "weight": 376,
+                    "weight": 382,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5785,6 +5998,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5840,7 +6056,9 @@
                "consumes": [
                    "application\/json"
                ],
-                "produces": [],
+                "produces": [
+                    "application\/json"
+                ],
                "tags": [
                    "messaging"
                ],
@@ -5852,7 +6070,7 @@
                },
                "x-appwrite": {
                    "method": "deleteSubscriber",
-                    "weight": 380,
+                    "weight": 386,
                    "cookies": false,
                    "type": "",
                    "deprecated": false,
@@ -5869,6 +6087,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -5940,6 +6161,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6022,6 +6246,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6113,6 +6340,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6182,6 +6412,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6270,6 +6503,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6341,6 +6577,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6412,6 +6651,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6560,7 +6802,6 @@
                            "gif",
                            "png",
                            "webp",
-                            "heic",
                            "avif"
                        ],
                        "x-enum-name": "ImageFormat",
@@ -6611,6 +6852,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6682,6 +6926,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6756,6 +7003,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6847,6 +7097,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams",
+                    "offline-key": "{teamId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6908,6 +7161,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams",
+                    "offline-key": "{teamId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -6982,6 +7238,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7045,6 +7304,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams\/{teamId}\/memberships",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7127,6 +7389,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7241,6 +7506,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams\/{teamId}\/memberships",
+                    "offline-key": "{membershipId}",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7310,6 +7578,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7395,6 +7666,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7465,6 +7739,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7560,6 +7837,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams\/{teamId}\/prefs",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -7620,6 +7900,9 @@
                        "server"
                    ],
                    "packaging": false,
+                    "offline-model": "\/teams\/{teamId}\/prefs",
+                    "offline-key": "",
+                    "offline-response-key": "$id",
                    "auth": {
                        "Project": []
                    }
@@ -1,10 +1,8 @@
 <?php

-return [
-    // Accepted inputs files
-    "jpg" => "image/jpeg",
-    "jpeg" => "image/jpeg",
-    "gif" => "image/gif",
-    "png" => "image/png",
-    "heic" => "image/heic",
+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'
 ];
@@ -268,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' => ''
-            ]
        ],
    ],
    [
@@ -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,20 +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',
-        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)
@@ -196,20 +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',
-        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)
@@ -223,20 +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',
-        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)
@@ -250,20 +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',
-        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)
@@ -320,20 +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',
-        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) {
@@ -470,20 +430,13 @@ App::get('/v1/avatars/qr')
    ->desc('Get QR code')
    ->groups(['api', 'avatars'])
    ->label('scope', 'avatars.read')
-    ->label('sdk', new Method(
-        namespace: 'avatars',
-        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)
@@ -518,20 +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',
-        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)
@@ -619,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);
@@ -637,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'] ?? '';

@@ -826,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);
@@ -843,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);
@@ -904,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);
@@ -926,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,19 +21,13 @@ App::get('/v1/console/variables')
    ->desc('Get variables')
    ->groups(['api', 'projects'])
    ->label('scope', 'projects.read')
-    ->label('sdk', new Method(
-        namespace: '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', ''))
@@ -70,25 +60,18 @@ App::post('/v1/console/assistant')
    ->desc('Ask query')
    ->groups(['api', 'assistant'])
    ->label('scope', 'assistant.read')
-    ->label('sdk', new Method(
-        namespace: 'assistant',
-        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,19 +38,13 @@ App::get('/v1/graphql')
    ->desc('GraphQL endpoint')
    ->groups(['graphql'])
    ->label('scope', 'graphql')
-    ->label('sdk', new Method(
-        namespace: '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.')
@@ -88,22 +78,17 @@ App::post('/v1/graphql/mutation')
    ->desc('GraphQL endpoint')
    ->groups(['graphql'])
    ->label('scope', 'graphql')
-    ->label('sdk', new Method(
-        namespace: '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')
@@ -138,22 +123,17 @@ App::post('/v1/graphql')
    ->desc('GraphQL endpoint')
    ->groups(['graphql'])
    ->label('scope', 'graphql')
-    ->label('sdk', new Method(
-        namespace: '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,10 +3,6 @@
 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;
@@ -30,19 +26,13 @@ App::get('/v1/health')
    ->desc('Get HTTP')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        namespace: '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) {

@@ -59,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);
@@ -68,19 +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',
-        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) {
@@ -128,19 +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',
-        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) {
@@ -192,19 +173,13 @@ App::get('/v1/health/queue')
    ->desc('Get queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        name: 'getQueue',
-        description: '/docs/references/health/get-queue.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_STATUS,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
+    ->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) {
@@ -255,19 +230,13 @@ App::get('/v1/health/pubsub')
    ->desc('Get pubsub')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: '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) {
@@ -319,19 +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',
-        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) {

@@ -382,19 +345,13 @@ 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',
-        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('queue')
    ->inject('response')
@@ -415,19 +372,13 @@ 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',
-        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('queue')
    ->inject('response')
@@ -448,19 +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',
-        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) {
@@ -504,19 +449,13 @@ 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',
-        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('queue')
    ->inject('response')
@@ -537,19 +476,13 @@ 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',
-        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('queue')
    ->inject('response')
@@ -570,19 +503,13 @@ 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',
-        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('queue')
@@ -604,19 +531,13 @@ 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',
-        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('queue')
    ->inject('response')
@@ -637,19 +558,13 @@ 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',
-        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('queue')
    ->inject('response')
@@ -670,19 +585,13 @@ 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',
-        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('queue')
    ->inject('response')
@@ -703,19 +612,13 @@ 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',
-        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('queue')
    ->inject('response')
@@ -736,19 +639,13 @@ 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',
-        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('queue')
    ->inject('response')
@@ -769,19 +666,13 @@ App::get('/v1/health/queue/usage')
    ->desc('Get usage queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        name: 'getQueueUsage',
-        description: '/docs/references/health/get-queue-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', '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('queue')
    ->inject('response')
@@ -802,19 +693,13 @@ App::get('/v1/health/queue/usage-dump')
    ->desc('Get usage dump queue')
    ->groups(['api', 'health'])
    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        name: 'getQueueUsageDump',
-        description: '/docs/references/health/get-queue-usage-dump.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('queue')
    ->inject('response')
@@ -835,19 +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',
-        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) {

@@ -884,19 +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',
-        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')
@@ -931,19 +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',
-        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) {

@@ -976,19 +843,9 @@ 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',
-        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,
@@ -1004,6 +861,10 @@ 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('queue')
    ->action(function (string $name, int|string $threshold, Response $response, Connection $queue) {
@@ -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,18 +12,15 @@ App::get('/v1/locale')
    ->desc('Get user locale')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
-    ->label('sdk', new Method(
-        namespace: 'locale',
-        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')
@@ -78,18 +72,15 @@ App::get('/v1/locale/codes')
    ->desc('List locale codes')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
-    ->label('sdk', new Method(
-        namespace: 'locale',
-        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');
@@ -103,18 +94,15 @@ App::get('/v1/locale/countries')
    ->desc('List countries')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
-    ->label('sdk', new Method(
-        namespace: 'locale',
-        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) {
@@ -139,18 +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',
-        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) {
@@ -177,18 +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',
-        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) {
@@ -214,18 +196,15 @@ App::get('/v1/locale/continents')
    ->desc('List continents')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
-    ->label('sdk', new Method(
-        namespace: 'locale',
-        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) {
@@ -249,18 +228,15 @@ App::get('/v1/locale/currencies')
    ->desc('List currencies')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
-    ->label('sdk', new Method(
-        namespace: 'locale',
-        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');
@@ -275,18 +251,15 @@ App::get('/v1/locale/languages')
    ->desc('List languages')
    ->groups(['api', 'locale'])
    ->label('scope', 'locale.read')
-    ->label('sdk', new Method(
-        namespace: 'locale',
-        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,16 +1,17 @@
 <?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\Query as QueryException;
 use Utopia\Database\Helpers\ID;
@@ -21,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;
@@ -35,18 +38,13 @@ App::post('/v1/migrations/appwrite')
    ->label('scope', 'migrations.write')
    ->label('event', 'migrations.[migrationId].create')
    ->label('audits.event', 'migration.create')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        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's Appwrite Endpoint")
    ->param('projectId', '', new UID(), "Source's Project ID")
@@ -89,25 +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('Migrate Firebase data')
+    ->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',
-        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')
@@ -162,18 +257,13 @@ App::post('/v1/migrations/supabase')
    ->label('scope', 'migrations.write')
    ->label('event', 'migrations.[migrationId].create')
    ->label('audits.event', 'migration.create')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        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,18 +318,13 @@ App::post('/v1/migrations/nhost')
    ->label('scope', 'migrations.write')
    ->label('event', 'migrations.[migrationId].create')
    ->label('audits.event', 'migration.create')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        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')
@@ -294,18 +379,13 @@ App::get('/v1/migrations')
    ->groups(['api', 'migrations'])
    ->desc('List migrations')
    ->label('scope', 'migrations.read')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        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')
@@ -358,18 +438,13 @@ App::get('/v1/migrations/:migrationId')
    ->groups(['api', 'migrations'])
    ->desc('Get migration')
    ->label('scope', 'migrations.read')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        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')
@@ -387,18 +462,13 @@ App::get('/v1/migrations/appwrite/report')
    ->groups(['api', 'migrations'])
    ->desc('Generate a report on Appwrite data')
    ->label('scope', 'migrations.write')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        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")
@@ -434,18 +504,13 @@ App::get('/v1/migrations/firebase/report')
    ->groups(['api', 'migrations'])
    ->desc('Generate a report on Firebase data')
    ->label('scope', 'migrations.write')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        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')
@@ -482,22 +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('Generate a report on Supabase Data')
    ->label('scope', 'migrations.write')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        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.')
@@ -534,18 +956,13 @@ App::get('/v1/migrations/nhost/report')
    ->groups(['api', 'migrations'])
    ->desc('Generate a report on NHost Data')
    ->label('scope', 'migrations.write')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        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.')
@@ -585,18 +1002,13 @@ App::patch('/v1/migrations/:migrationId')
    ->label('event', 'migrations.[migrationId].retry')
    ->label('audits.event', 'migration.retry')
    ->label('audits.resource', 'migrations/{request.migrationId}')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        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')
@@ -635,19 +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',
-        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;
@@ -24,25 +20,18 @@ App::get('/v1/project/usage')
    ->desc('Get project usage stats')
    ->groups(['api', 'usage'])
    ->label('scope', 'projects.read')
-    ->label('sdk', new Method(
-        namespace: 'project',
-        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('dbForProject')
-    ->inject('smsRates')
-    ->action(function (string $startDate, string $endDate, string $period, Response $response, Database $dbForProject, array $smsRates) {
+    ->action(function (string $startDate, string $endDate, string $period, Response $response, Database $dbForProject) {
        $stats = $total = $usage = [];
        $format = 'Y-m-d 00:00:00';
        $firstDay = (new DateTime($startDate))->format($format);
@@ -60,9 +49,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_BUILDS_STORAGE
            ],
            'period' => [
                METRIC_NETWORK_REQUESTS,
@@ -72,9 +59,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_BUILDS_MB_SECONDS
            ]
        ];

@@ -272,46 +257,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) {
@@ -350,19 +295,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,
        ]), Response::MODEL_USAGE_PROJECT);
    });

@@ -373,25 +313,20 @@ App::post('/v1/project/variables')
    ->groups(['api'])
    ->label('scope', 'projects.write')
    ->label('audits.event', 'variable.create')
-    ->label('sdk', new Method(
-        namespace: 'project',
-        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)
    ->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, Document $project, Response $response, Database $dbForProject, Database $dbForConsole) {
        $variableId = ID::unique();

        $variable = new Document([
@@ -432,18 +367,13 @@ App::get('/v1/project/variables')
    ->desc('List variables')
    ->groups(['api'])
    ->label('scope', 'projects.read')
-    ->label('sdk', new Method(
-        namespace: 'project',
-        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) {
@@ -462,18 +392,13 @@ App::get('/v1/project/variables/:variableId')
    ->desc('Get variable')
    ->groups(['api'])
    ->label('scope', 'projects.read')
-    ->label('sdk', new Method(
-        namespace: 'project',
-        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')
@@ -491,26 +416,21 @@ App::put('/v1/project/variables/:variableId')
    ->desc('Update variable')
    ->groups(['api'])
    ->label('scope', 'projects.write')
-    ->label('sdk', new Method(
-        namespace: 'project',
-        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);
@@ -542,19 +462,12 @@ App::delete('/v1/project/variables/:variableId')
    ->desc('Delete variable')
    ->groups(['api'])
    ->label('scope', 'projects.write')
-    ->label('sdk', new Method(
-        namespace: 'project',
-        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,18 +28,13 @@ 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',
-        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('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)
@@ -52,9 +42,9 @@ App::post('/v1/proxy/rules')
    ->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.');
@@ -69,15 +59,8 @@ App::post('/v1/proxy/rules')
            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()) {
@@ -118,9 +101,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(),
@@ -154,7 +135,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());

@@ -169,24 +150,19 @@ App::get('/v1/proxy/rules')
    ->groups(['api', 'proxy'])
    ->desc('List rules')
    ->label('scope', 'rules.read')
-    ->label('sdk', new Method(
-        namespace: 'proxy',
-        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) {
@@ -215,7 +191,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.");
@@ -226,16 +202,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);
    });

@@ -243,30 +219,25 @@ App::get('/v1/proxy/rules/:ruleId')
    ->groups(['api', 'proxy'])
    ->desc('Get rule')
    ->label('scope', 'rules.read')
-    ->label('sdk', new Method(
-        namespace: 'proxy',
-        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', ''));

@@ -280,33 +251,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',
-        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)
@@ -324,27 +288,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',
-        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);
@@ -374,7 +332,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
@@ -385,7 +343,7 @@ 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);
@@ -6,14 +6,8 @@ use Appwrite\Auth\Auth;
 use Appwrite\ClamAV\Network;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
-use Appwrite\Event\Usage;
 use Appwrite\Extend\Exception;
 use Appwrite\OpenSSL\OpenSSL;
-use Appwrite\SDK\AuthType;
-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;
@@ -21,7 +15,6 @@ 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;
@@ -61,18 +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',
-        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)
@@ -86,14 +74,13 @@ App::post('/v1/storage/buckets')
    ->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)) {
@@ -163,18 +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',
-        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')
@@ -229,18 +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',
-        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')
@@ -263,18 +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',
-        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)
@@ -288,7 +260,7 @@ App::put('/v1/storage/buckets/:bucketId')
    ->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()) {
@@ -333,19 +305,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',
-        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')
@@ -386,20 +351,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',
-        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)
@@ -755,18 +715,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',
-        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)
@@ -852,18 +807,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',
-        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')
@@ -908,20 +858,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',
-        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)
@@ -942,8 +885,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
    ->inject('mode')
    ->inject('deviceForFiles')
    ->inject('deviceForLocal')
-    ->inject('queueForUsage')
-    ->action(function (string $bucketId, string $fileId, int $width, int $height, string $gravity, int $quality, int $borderWidth, string $borderColor, int $borderRadius, float $opacity, int $rotation, string $background, string $output, Request $request, Response $response, Document $project, Database $dbForProject, string $mode, Device $deviceForFiles, Device $deviceForLocal, Usage $queueForUsage) {
+    ->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');
@@ -1071,17 +1013,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')

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

-        $queueForUsage
-            ->addMetric(METRIC_FILES_TRANSFORMATIONS, 1)
-            ->addMetric(str_replace('{bucketInternalId}', $bucket->getInternalId(), METRIC_BUCKET_ID_FILES_TRANSFORMATIONS), 1)
-        ;
-
-        $transformedAt = $file->getAttribute('transformedAt', '');
-        if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $transformedAt) {
-            $file->setAttribute('transformedAt', DateTime::now());
-            Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' .  $file->getAttribute('bucketInternalId'), $file->getId(), $file));
-        }
-
        $response
            ->addHeader('Cache-Control', 'private, max-age=2592000') // 30 days
            ->setContentType($contentType)
@@ -1097,20 +1028,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',
-        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')
@@ -1245,20 +1169,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',
-        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')
@@ -1565,18 +1482,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',
-        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)
@@ -1679,19 +1591,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',
-        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')
@@ -1778,18 +1683,12 @@ App::get('/v1/storage/usage')
    ->groups(['api', 'storage'])
    ->label('scope', 'files.read')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
-    ->label('sdk', new Method(
-        namespace: 'storage',
-        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')
@@ -1864,18 +1763,12 @@ App::get('/v1/storage/:bucketId/usage')
    ->groups(['api', 'storage'])
    ->label('scope', 'files.read')
    ->label('resourceType', RESOURCE_TYPE_BUCKETS)
-    ->label('sdk', new Method(
-        namespace: 'storage',
-        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')
@@ -8,23 +8,16 @@ use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Mail;
 use Appwrite\Event\Messaging;
-use Appwrite\Event\Usage;
 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;
@@ -60,18 +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',
-        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)
@@ -150,18 +138,14 @@ App::get('/v1/teams')
    ->desc('List teams')
    ->groups(['api', 'teams'])
    ->label('scope', 'teams.read')
-    ->label('sdk', new Method(
-        namespace: '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')
@@ -218,18 +202,15 @@ App::get('/v1/teams/:teamId')
    ->desc('Get team')
    ->groups(['api', 'teams'])
    ->label('scope', 'teams.read')
-    ->label('sdk', new Method(
-        namespace: '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')
@@ -248,18 +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',
-        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')
@@ -283,18 +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',
-        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')
@@ -330,18 +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',
-        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')
@@ -369,19 +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',
-        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')
@@ -427,18 +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',
-        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)
@@ -465,10 +423,7 @@ App::post('/v1/teams/:teamId/memberships')
    ->inject('queueForMails')
    ->inject('queueForMessaging')
    ->inject('queueForEvents')
-    ->inject('timelimit')
-    ->inject('queueForUsage')
-    ->inject('plan')
-    ->action(function (string $teamId, string $email, string $userId, string $phone, array $roles, string $url, string $name, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Mail $queueForMails, Messaging $queueForMessaging, Event $queueForEvents, callable $timelimit, Usage $queueForUsage, array $plan) {
+    ->action(function (string $teamId, string $email, string $userId, string $phone, array $roles, string $url, string $name, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Mail $queueForMails, Messaging $queueForMessaging, Event $queueForEvents) {
        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());

@@ -585,58 +540,47 @@ 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()])
        ]);

-        if ($membership->isEmpty()) {
-            $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()])
-            ]);
-
-            $membership = ($isPrivilegedUser || $isAppUser) ?
-                Authorization::skip(fn () => $dbForProject->createDocument('memberships', $membership)) :
-                $dbForProject->createDocument('memberships', $membership);
-            Authorization::skip(fn () => $dbForProject->increaseDocumentAttribute('teams', $team->getId(), 'total', 1));
-
-        } else {
-            $membership->setAttribute('invited', DateTime::now());
-
-            if ($isPrivilegedUser || $isAppUser) {
-                $membership->setAttribute('joined', DateTime::now());
-                $membership->setAttribute('confirm', true);
+        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);
            }

-            $membership = ($isPrivilegedUser || $isAppUser) ?
-                Authorization::skip(fn () => $dbForProject->updateDocument('memberships', $membership->getId(), $membership)) :
-                $dbForProject->updateDocument('memberships', $membership->getId(), $membership);
-        }
+            Authorization::skip(fn () => $dbForProject->increaseDocumentAttribute('teams', $team->getId(), 'total', 1));

-
-        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]);
            $url = Template::unParseURL($url);
@@ -706,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
@@ -718,8 +662,8 @@ App::post('/v1/teams/:teamId/memberships')
                    ->setRecipient($invitee->getAttribute('email'))
                    ->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');
@@ -747,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)) {
-                            $queueForUsage
-                                ->addMetric(str_replace('{countryCode}', $countryCode, METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE), 1);
-                        }
-                    }
-                    $queueForUsage
-                        ->addMetric(METRIC_AUTH_METHOD_PHONE, 1)
-                        ->setProject($project)
-                        ->trigger();
-                }
            }
        }

@@ -792,18 +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',
-        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)
@@ -930,18 +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',
-        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')
@@ -1016,18 +932,13 @@ 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',
-        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) {
@@ -1104,18 +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',
-        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.')
@@ -1261,19 +1167,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',
-        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')
@@ -1331,18 +1230,13 @@ App::get('/v1/teams/:teamId/logs')
    ->desc('List team logs')
    ->groups(['api', 'teams'])
    ->label('scope', 'teams.read')
-    ->label('sdk', new Method(
-        namespace: 'teams',
-        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')
@@ -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;
@@ -47,7 +42,7 @@ 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) {
        try {
@@ -58,7 +53,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
            }

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

            $functionId = $resource->getAttribute('resourceId');
@@ -109,7 +104,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
            $latestCommentId = '';

            if (!empty($providerPullRequestId) && $function->getAttribute('providerSilentMode', false) === false) {
-                $latestComment = Authorization::skip(fn () => $dbForPlatform->findOne('vcsComments', [
+                $latestComment = Authorization::skip(fn () => $dbForConsole->findOne('vcsComments', [
                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
                    Query::equal('providerPullRequestId', [$providerPullRequestId]),
                    Query::orderDesc('$createdAt'),
@@ -130,7 +125,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                    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))),
@@ -151,7 +146,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'),
@@ -272,22 +267,15 @@ App::get('/v1/vcs/github/authorize')
    ->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',
-        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')
@@ -331,8 +319,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);
@@ -351,7 +339,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.';
@@ -367,6 +355,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');
@@ -376,27 +411,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', '');

@@ -414,21 +433,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.';
@@ -454,27 +467,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',
-        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,27 +528,22 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories/:pr
    ->desc('Detect runtime settings from source code')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.write')
-    ->label('sdk', new Method(
-        namespace: 'vcs',
-        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);
@@ -597,30 +600,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',
-        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);
@@ -697,18 +695,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',
-        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')
@@ -716,9 +709,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);
@@ -727,24 +720,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);
@@ -758,12 +745,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 {
@@ -809,26 +796,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',
-        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);
@@ -863,26 +845,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',
-        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);
@@ -920,11 +897,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', '');
@@ -958,36 +935,36 @@ App::post('/v1/vcs/github/events')
                $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);

                //find functionId from functions table
-                $repositories = Authorization::skip(fn () => $dbForPlatform->find('repositories', [
+                $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)
                    $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) {
@@ -1016,12 +993,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

@@ -1030,7 +1007,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')
                        ]));
@@ -1041,7 +1018,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));
                            }
                        }
                    }
@@ -1056,25 +1033,20 @@ App::get('/v1/vcs/installations')
    ->desc('List installations')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.read')
-    ->label('sdk', new Method(
-        namespace: 'vcs',
-        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) {
@@ -1103,7 +1075,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.");
@@ -1114,8 +1086,8 @@ App::get('/v1/vcs/installations')

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

-        $results = $dbForPlatform->find('installations', $queries);
-        $total = $dbForPlatform->count('installations', $filterQueries, APP_LIMIT_COUNT);
+        $results = $dbForConsole->find('installations', $queries);
+        $total = $dbForConsole->count('installations', $filterQueries, APP_LIMIT_COUNT);

        $response->dynamic(new Document([
            'installations' => $results,
@@ -1127,24 +1099,19 @@ App::get('/v1/vcs/installations/:installationId')
    ->desc('Get installation')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.read')
-    ->label('sdk', new Method(
-        namespace: 'vcs',
-        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);
@@ -1161,32 +1128,25 @@ App::delete('/v1/vcs/installations/:installationId')
    ->desc('Delete installation')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.write')
-    ->label('sdk', new Method(
-        namespace: 'vcs',
-        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');
        }

@@ -1201,18 +1161,12 @@ App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositor
    ->desc('Authorize external deployment')
    ->groups(['api', 'vcs'])
    ->label('scope', 'vcs.write')
-    ->label('sdk', new Method(
-        namespace: 'vcs',
-        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')
@@ -1220,17 +1174,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()])
        ]));

@@ -1247,7 +1201,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');
@@ -1271,7 +1225,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();
    });
@@ -10,10 +10,6 @@ use Appwrite\Event\Func;
 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\Utopia\Request;
 use Appwrite\Utopia\Request\Filters\V16 as RequestV16;
 use Appwrite\Utopia\Request\Filters\V17 as RequestV17;
@@ -33,7 +29,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;
@@ -50,26 +45,13 @@ 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, Usage $queueForUsage, Func $queueForFunctions, 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();
-    }
+    $route = Authorization::skip(fn () => $dbForConsole->getDocument('rules', md5($host)));

    if ($route->isEmpty()) {
        if ($host === System::getEnv('_APP_DOMAIN_FUNCTIONS', '')) {
@@ -93,17 +75,8 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw

    $projectId = $route->getAttribute('projectId');
    $project = Authorization::skip(
-        fn () => $dbForPlatform->getDocument('projects', $projectId)
+        fn () => $dbForConsole->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));
-        }
-    }
-
    if (array_key_exists('proxy', $project->getAttribute('services', []))) {
        $status = $project->getAttribute('services', [])['proxy'];
        if (!$status) {
@@ -120,29 +93,8 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
    $type = $route->getAttribute('resourceType');

    if ($type === 'function') {
-        $method = $utopia->getRoute()?->getLabel('sdk', null);
-
-        if (empty($method)) {
-            $utopia->getRoute()?->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'createExecution',
-                description: '/docs/references/functions/create-execution.md',
-                auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_CREATED,
-                        model: Response::MODEL_EXECUTION,
-                    )
-                ],
-                contentType: ContentType::MULTIPART,
-                requestType: 'application/json',
-            ));
-        } else {
-            /** @var Method $method */
-            $method->setNamespace('functions');
-            $method->setMethodName('createExecution');
-            $utopia->getRoute()?->label('sdk', $method);
-        }
+        $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 ($request->getProtocol() !== 'https') {
@@ -169,7 +121,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw

        $requestHeaders = $request->getHeaders();

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

        $dbForProject = $getProjectDB($project);

@@ -394,6 +346,26 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
                throw $th;
            }
        } finally {
+            $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())
+                ->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()
+            ;
+
            $queueForFunctions
                ->setType(Func::TYPE_ASYNC_WRITE)
                ->setExecution($execution)
@@ -428,26 +400,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'];
-        }
-
-        $queueForUsage
-            ->addMetric(METRIC_NETWORK_REQUESTS, 1)
-            ->addMetric(METRIC_NETWORK_INBOUND, $request->getSize() + $fileSize)
-            ->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize())
-            ->addMetric(METRIC_EXECUTIONS, 1)
-            ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS), 1)
-            ->addMetric(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', '');
@@ -493,7 +445,7 @@ App::init()
    ->inject('response')
    ->inject('console')
    ->inject('project')
-    ->inject('dbForPlatform')
+    ->inject('dbForConsole')
    ->inject('getProjectDB')
    ->inject('locale')
    ->inject('localeCodes')
@@ -504,16 +456,15 @@ App::init()
    ->inject('queueForCertificates')
    ->inject('queueForFunctions')
    ->inject('isResourceBlocked')
-    ->inject('previewHostname')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, Usage $queueForUsage, Event $queueForEvents, Certificate $queueForCertificates, Func $queueForFunctions, callable $isResourceBlocked, string $previewHostname) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $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, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname)) {
+        if ($host !== $mainDomain) {
+            if (router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked)) {
                return;
            }
        }
@@ -561,31 +512,18 @@ 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()])
-                        ]);
-                    }
+                    $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',
@@ -593,7 +531,7 @@ App::init()
                            '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...');

@@ -729,23 +667,22 @@ App::options()
    ->inject('swooleRequest')
    ->inject('request')
    ->inject('response')
-    ->inject('dbForPlatform')
+    ->inject('dbForConsole')
    ->inject('getProjectDB')
    ->inject('queueForEvents')
    ->inject('queueForUsage')
    ->inject('queueForFunctions')
    ->inject('geodb')
    ->inject('isResourceBlocked')
-    ->inject('previewHostname')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, 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) {
        /*
        * 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, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname)) {
+        if ($host !== $mainDomain) {
+            if (router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked)) {
                return;
            }
        }
@@ -833,10 +770,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();
@@ -864,7 +797,7 @@ App::error()

                    $adapter = new Sentry($projectId, $key, $host);
                    $logger = new Logger($adapter);
-                    $logger->setSample(0.01);
+                    $logger->setSample(0.04);
                    $publish = true;
                } else {
                    throw new \Exception('Invalid experimental logging provider');
@@ -904,8 +837,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 {
@@ -916,14 +847,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());
@@ -935,14 +866,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);
@@ -1037,23 +962,22 @@ App::get('/robots.txt')
    ->inject('swooleRequest')
    ->inject('request')
    ->inject('response')
-    ->inject('dbForPlatform')
+    ->inject('dbForConsole')
    ->inject('getProjectDB')
    ->inject('queueForEvents')
    ->inject('queueForUsage')
    ->inject('queueForFunctions')
    ->inject('geodb')
    ->inject('isResourceBlocked')
-    ->inject('previewHostname')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, 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, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname);
+            router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked);
        }
    });

@@ -1065,23 +989,22 @@ App::get('/humans.txt')
    ->inject('swooleRequest')
    ->inject('request')
    ->inject('response')
-    ->inject('dbForPlatform')
+    ->inject('dbForConsole')
    ->inject('getProjectDB')
    ->inject('queueForEvents')
    ->inject('queueForUsage')
    ->inject('queueForFunctions')
    ->inject('geodb')
    ->inject('isResourceBlocked')
-    ->inject('previewHostname')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, 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, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname);
+            router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked);
        }
    });

@@ -1145,9 +1068,9 @@ 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) {
+    ->action(function (Response $response, Document $project, Database $dbForConsole, Event $queueForEvents) {
        if ($project->isEmpty()) {
            throw new AppwriteException(AppwriteException::PROJECT_NOT_FOUND);
        }
@@ -1159,8 +1082,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
@@ -1180,8 +1103,3 @@ App::wildcard()
 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()));
-}
@@ -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([
@@ -19,6 +19,7 @@ use Appwrite\Extend\Exception as AppwriteException;
 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;
@@ -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,20 +75,17 @@ $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, Usage $queueForUsage) {
@@ -186,16 +184,14 @@ 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')
-    ->action(function (App $utopia, Request $request, Database $dbForPlatform, Database $dbForProject, Audit $queueForAudits, Document $project, Document $user, ?Document $session, array $servers, string $mode, Document $team) {
+    ->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()) {
@@ -231,7 +227,7 @@ App::init()
            if ($keyType === API_KEY_DYNAMIC) {
                // Dynamic key

-                $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 86400, 0);
+                $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 3600, 0);

                try {
                    $payload = $jwtObj->decode($authKey);
@@ -247,10 +243,9 @@ App::init()
                    $user = new Document([
                        '$id' => '',
                        'status' => true,
-                        'type' => Auth::ACTIVITY_TYPE_APP,
                        'email' => 'app.' . $project->getId() . '@service.' . $request->getHostname(),
                        'password' => '',
-                        'name' => 'Dynamic Key',
+                        'name' => $project->getAttribute('name', 'Untitled'),
                    ]);

                    $role = Auth::USER_ROLE_APPS;
@@ -258,8 +253,6 @@ App::init()

                    Authorization::setRole(Auth::USER_ROLE_APPS);
                    Authorization::setDefaultStatus(false);  // Cancel security segmentation for API keys.
-
-                    $queueForAudits->setUser($user);
                }
            } elseif ($keyType === API_KEY_STANDARD) {
                // No underline means no prefix. Backwards compatibility.
@@ -271,10 +264,9 @@ App::init()
                    $user = new Document([
                        '$id' => '',
                        'status' => true,
-                        'type' => Auth::ACTIVITY_TYPE_APP,
                        'email' => 'app.' . $project->getId() . '@service.' . $request->getHostname(),
                        'password' => '',
-                        'name' => $key->getAttribute('name', 'UNKNOWN'),
+                        'name' => $project->getAttribute('name', 'Untitled'),
                    ]);

                    $role = Auth::USER_ROLE_APPS;
@@ -291,8 +283,8 @@ App::init()
                    $accessedAt = $key->getAttribute('accessedAt', '');
                    if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_KEY_ACCESS)) > $accessedAt) {
                        $key->setAttribute('accessedAt', DateTime::now());
-                        $dbForPlatform->updateDocument('keys', $key->getId(), $key);
-                        $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+                        $dbForConsole->updateDocument('keys', $key->getId(), $key);
+                        $dbForConsole->purgeCachedDocument('projects', $project->getId());
                    }

                    $sdkValidator = new WhiteList($servers, true);
@@ -305,12 +297,10 @@ App::init()

                            /** Update access time as well */
                            $key->setAttribute('accessedAt', Datetime::now());
-                            $dbForPlatform->updateDocument('keys', $key->getId(), $key);
-                            $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+                            $dbForConsole->updateDocument('keys', $key->getId(), $key);
+                            $dbForConsole->purgeCachedDocument('projects', $project->getId());
                        }
                    }
-
-                    $queueForAudits->setUser($user);
                }
            }
        }
@@ -345,48 +335,12 @@ 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);
-                }
-            }
-        }
-
        /** Do not allow access to disabled services */
-        /**
-         * @var ?\Appwrite\SDK\Method $method
-         */
-        $method = $route->getLabel('sdk', false);
-
-        if (is_array($method)) {
-            $method = $method[0];
-        }
-
-        if (!empty($method)) {
-            $namespace = $method->getNamespace();
+        $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);
@@ -438,9 +392,8 @@ App::init()
    ->inject('queueForBuilds')
    ->inject('queueForUsage')
    ->inject('dbForProject')
-    ->inject('timelimit')
    ->inject('mode')
-    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Connection $queue, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Usage $queueForUsage, Database $dbForProject, callable $timelimit, string $mode) use ($usageDatabaseListener, $eventDatabaseListener) {
+    ->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();

@@ -463,7 +416,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())
@@ -491,7 +444,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;
@@ -525,17 +478,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);
-        }
+            ->setProject($project)
+            ->setUser($user);

        $queueForDeletes->setProject($project);
        $queueForDatabase->setProject($project);
@@ -553,7 +498,6 @@ App::init()
            ->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),
@@ -607,12 +551,6 @@ App::init()
                    if ($file->isEmpty()) {
                        throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
                    }
-
-                    $transformedAt = $file->getAttribute('transformedAt', '');
-                    if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $transformedAt) {
-                        $file->setAttribute('transformedAt', DateTime::now());
-                        Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $file->getAttribute('bucketInternalId'), $file->getId(), $file));
-                    }
                }

                $response
@@ -703,7 +641,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, Usage $queueForUsage, 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();

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

+            $queueForWebhooks
+                ->from($queueForEvents)
+                ->trigger();
+
            $queueForFunctions
                ->from($queueForEvents)
                ->trigger();
@@ -721,17 +665,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();
@@ -749,32 +682,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
@@ -852,6 +763,8 @@ App::shutdown()
            }
        }

+
+
        if ($project->getId() !== 'console') {
            if (!Auth::isPrivilegedUser(Authorization::getRoles())) {
                $fileSize = 0;
@@ -870,6 +783,33 @@ App::shutdown()
                ->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,19 +9,18 @@ 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\Cache\Cache;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
-use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
-use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Logger\Log;
 use Utopia\Logger\Log\User;
@@ -29,12 +28,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),
@@ -42,17 +35,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));
+$workerNumber = swoole_cpu_num() * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));

 $http
    ->set([
-        'worker_num' => $totalWorkers,
-        'dispatch_func' => 'dispatch',
+        'worker_num' => $workerNumber,
        'open_http2_protocol' => true,
        'http_compression' => false,
        'package_max_length' => $payloadSize,
        'buffer_output_size' => $payloadSize,
-        'task_worker_num' => 1, // required for the task to fetch domains background
    ]);

 $http->on(Constant::EVENT_WORKER_START, function ($server, $workerId) {
@@ -67,93 +58,6 @@ $http->on(Constant::EVENT_AFTER_RELOAD, function ($server, $workerId) {
    Console::success('Reload completed...');
 });

-/**
- * 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
-{
-    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;
-}
-
 include __DIR__ . '/controllers/general.php';

 $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $register) {
@@ -172,8 +76,8 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
        do {
            try {
                $attempts++;
-                $dbForPlatform = $app->getResource('dbForPlatform');
-                /** @var Utopia\Database\Database $dbForPlatform */
+                $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})...");
@@ -188,16 +92,21 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg

        try {
            Console::success('[Setup] - Creating console database...');
-            $dbForPlatform->create();
+            $dbForConsole->create();
        } catch (Duplicate) {
            Console::success('[Setup] - Skip: metadata table already exists');
        }

-        if ($dbForPlatform->getCollection(Audit::COLLECTION)->isEmpty()) {
-            $audit = new Audit($dbForPlatform);
+        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', []);
        $consoleCollections = $collections['console'];
@@ -205,7 +114,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
            if (($collection['$collection'] ?? '') !== Database::METADATA) {
                continue;
            }
-            if (!$dbForPlatform->getCollection($key)->isEmpty()) {
+            if (!$dbForConsole->getCollection($key)->isEmpty()) {
                continue;
            }

@@ -214,12 +123,12 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
            $attributes = \array_map(fn ($attribute) => new Document($attribute), $collection['attributes']);
            $indexes = \array_map(fn (array $index) => new Document($index), $collection['indexes']);

-            $dbForPlatform->createCollection($key, $attributes, $indexes);
+            $dbForConsole->createCollection($key, $attributes, $indexes);
        }

-        if ($dbForPlatform->getDocument('buckets', 'default')->isEmpty() && !$dbForPlatform->exists($dbForPlatform->getDatabase(), 'bucket_1')) {
+        if ($dbForConsole->getDocument('buckets', 'default')->isEmpty() && !$dbForConsole->exists($dbForConsole->getDatabase(), 'bucket_1')) {
            Console::success('[Setup] - Creating default bucket...');
-            $dbForPlatform->createDocument('buckets', new Document([
+            $dbForConsole->createDocument('buckets', new Document([
                '$id' => ID::custom('default'),
                '$collection' => ID::custom('buckets'),
                'name' => 'Default',
@@ -239,7 +148,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
                'search' => 'buckets Default',
            ]));

-            $bucket = $dbForPlatform->getDocument('buckets', 'default');
+            $bucket = $dbForConsole->getDocument('buckets', 'default');

            Console::success('[Setup] - Creating files collection for default bucket...');
            $files = $collections['buckets']['files'] ?? [];
@@ -250,7 +159,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
            $attributes = \array_map(fn ($attribute) => new Document($attribute), $files['attributes']);
            $indexes = \array_map(fn (array $index) => new Document($index), $files['indexes']);

-            $dbForPlatform->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes);
+            $dbForConsole->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes);
        }

        $projectCollections = $collections['projects'];
@@ -304,9 +213,6 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
    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');
@@ -334,7 +240,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');
@@ -363,12 +269,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());
@@ -386,16 +290,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);
@@ -434,59 +330,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();
@@ -48,7 +48,6 @@ use Appwrite\Utopia\Request;
 use MaxMind\Db\Reader;
 use PHPMailer\PHPMailer\PHPMailer;
 use Swoole\Database\PDOProxy;
-use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
 use Utopia\App;
 use Utopia\Cache\Adapter\Redis as RedisCache;
 use Utopia\Cache\Adapter\Sharding;
@@ -122,10 +121,9 @@ const APP_LIMIT_LIST_DEFAULT = 25; // Default maximum number of items to return
 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.1';
+const APP_VERSION_STABLE = '1.6.0';
 const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
 const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
 const APP_DATABASE_ATTRIBUTE_IP = 'ip';
@@ -155,9 +153,9 @@ const APP_SOCIAL_DEV = 'https://dev.to/appwrite';
 const APP_SOCIAL_STACKSHARE = 'https://stackshare.io/appwrite';
 const APP_SOCIAL_YOUTUBE = 'https://www.youtube.com/c/appwrite?sub_confirmation=1';
 const APP_HOSTNAME_INTERNAL = 'appwrite';
-const APP_FUNCTION_SPECIFICATION_DEFAULT = Specification::S_1VCPU_512MB;
-const APP_FUNCTION_CPUS_DEFAULT = 0.5;
-const APP_FUNCTION_MEMORY_DEFAULT = 512;
+const APP_FUNCTION_SPECIFICATION_DEFAULT = Specification::S_4VCPU_4GB;
+const APP_FUNCTION_CPUS_DEFAULT = 4;
+const APP_FUNCTION_MEMORY_DEFAULT = 4096;
 const APP_PLATFORM_SERVER = 'server';
 const APP_PLATFORM_CLIENT = 'client';
 const APP_PLATFORM_CONSOLE = 'console';
@@ -203,7 +201,6 @@ 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';
@@ -234,11 +231,6 @@ 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}';
@@ -261,15 +253,9 @@ 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_BUCKET_ID_FILES = '{bucketInternalId}.files';
 const METRIC_BUCKET_ID_FILES_STORAGE  = '{bucketInternalId}.files.storage';
 const METRIC_FUNCTIONS  = 'functions';
@@ -735,19 +721,12 @@ Database::addFilter(
        $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;
+        if ($providerType === MESSAGE_TYPE_EMAIL) {
+            $searchValues = \array_merge($searchValues, [$data['subject'], MESSAGE_TYPE_EMAIL]);
+        } elseif ($providerType === MESSAGE_TYPE_SMS) {
+            $searchValues = \array_merge($searchValues, [$data['content'], MESSAGE_TYPE_SMS]);
+        } else {
+            $searchValues = \array_merge($searchValues, [$data['title'], MESSAGE_TYPE_PUSH]);
        }

        $search = \implode(' ', \array_filter($searchValues));
@@ -771,7 +750,7 @@ Structure::addFormat(APP_DATABASE_ATTRIBUTE_DATETIME, function () {
 }, Database::VAR_DATETIME);

 Structure::addFormat(APP_DATABASE_ATTRIBUTE_ENUM, function ($attribute) {
-    $elements = $attribute['formatOptions']['elements'] ?? [];
+    $elements = $attribute['formatOptions']['elements'];
    return new WhiteList($elements, true);
 }, Database::VAR_STRING);

@@ -874,37 +853,31 @@ $register->set('pools', function () {
    $connections = [
        'console' => [
            'type' => 'database',
-            'dsns' => $fallbackForDB,
+            'dsns' => System::getEnv('_APP_CONNECTIONS_DB_CONSOLE', $fallbackForDB),
            'multiple' => false,
            'schemes' => ['mariadb', 'mysql'],
        ],
        'database' => [
            'type' => 'database',
-            'dsns' => $fallbackForDB,
+            'dsns' => System::getEnv('_APP_CONNECTIONS_DB_PROJECT', $fallbackForDB),
            'multiple' => true,
            'schemes' => ['mariadb', 'mysql'],
        ],
-        'logs' => [
-            'type' => 'database',
-            'dsns' => System::getEnv('_APP_CONNECTIONS_DB_LOGS', $fallbackForDB),
-            'multiple' => false,
-            'schemes' => ['mariadb', 'mysql'],
-        ],
        'queue' => [
            'type' => 'queue',
-            'dsns' => $fallbackForRedis,
+            'dsns' => System::getEnv('_APP_CONNECTIONS_QUEUE', $fallbackForRedis),
            'multiple' => false,
            'schemes' => ['redis'],
        ],
        'pubsub' => [
            'type' => 'pubsub',
-            'dsns' => $fallbackForRedis,
+            'dsns' => System::getEnv('_APP_CONNECTIONS_PUBSUB', $fallbackForRedis),
            'multiple' => false,
            'schemes' => ['redis'],
        ],
        'cache' => [
            'type' => 'cache',
-            'dsns' => $fallbackForRedis,
+            'dsns' => System::getEnv('_APP_CONNECTIONS_CACHE', $fallbackForRedis),
            'multiple' => true,
            'schemes' => ['redis'],
        ],
@@ -916,7 +889,7 @@ $register->set('pools', function () {
    $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));
+        $workerCount = swoole_cpu_num() * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
    } else {
        $workerCount = 1;
    }
@@ -976,12 +949,12 @@ $register->set('pools', function () {
                    });
                },
                'redis' => function () use ($dsnHost, $dsnPort, $dsnPass) {
-                    $redis = new \Redis();
+                    $redis = new Redis();
                    @$redis->pconnect($dsnHost, (int)$dsnPort);
                    if ($dsnPass) {
                        $redis->auth($dsnPass);
                    }
-                    $redis->setOption(\Redis::OPT_READ_TIMEOUT, -1);
+                    $redis->setOption(Redis::OPT_READ_TIMEOUT, -1);

                    return $redis;
                },
@@ -1240,12 +1213,12 @@ App::setResource('clients', function ($request, $console, $project) {
    return \array_unique($clients);
 }, ['request', 'console', 'project']);

-App::setResource('user', function ($mode, $project, $console, $request, $response, $dbForProject, $dbForPlatform) {
+App::setResource('user', function ($mode, $project, $console, $request, $response, $dbForProject, $dbForConsole) {
    /** @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 Utopia\Database\Database $dbForConsole */
    /** @var string $mode */

    Authorization::setDefaultStatus(true);
@@ -1294,13 +1267,13 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
            $user = new Document([]);
        } else {
            if ($project->getId() === 'console') {
-                $user = $dbForPlatform->getDocument('users', Auth::$unique);
+                $user = $dbForConsole->getDocument('users', Auth::$unique);
            } else {
                $user = $dbForProject->getDocument('users', Auth::$unique);
            }
        }
    } else {
-        $user = $dbForPlatform->getDocument('users', Auth::$unique);
+        $user = $dbForConsole->getDocument('users', Auth::$unique);
    }

    if (
@@ -1343,14 +1316,14 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
    }

    $dbForProject->setMetadata('user', $user->getId());
-    $dbForPlatform->setMetadata('user', $user->getId());
+    $dbForConsole->setMetadata('user', $user->getId());

    return $user;
-}, ['mode', 'project', 'console', 'request', 'response', 'dbForProject', 'dbForPlatform']);
+}, ['mode', 'project', 'console', 'request', 'response', 'dbForProject', 'dbForConsole']);

-App::setResource('project', function ($dbForPlatform, $request, $console) {
+App::setResource('project', function ($dbForConsole, $request, $console) {
    /** @var Appwrite\Utopia\Request $request */
-    /** @var Utopia\Database\Database $dbForPlatform */
+    /** @var Utopia\Database\Database $dbForConsole */
    /** @var Utopia\Database\Document $console */

    $projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', ''));
@@ -1359,10 +1332,10 @@ App::setResource('project', function ($dbForPlatform, $request, $console) {
        return $console;
    }

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

    return $project;
-}, ['dbForPlatform', 'request', 'console']);
+}, ['dbForConsole', 'request', 'console']);

 App::setResource('session', function (Document $user) {
    if ($user->isEmpty()) {
@@ -1427,9 +1400,9 @@ App::setResource('console', function () {
    ]);
 }, []);

-App::setResource('dbForProject', function (Group $pools, Database $dbForPlatform, Cache $cache, Document $project) {
+App::setResource('dbForProject', function (Group $pools, Database $dbForConsole, Cache $cache, Document $project) {
    if ($project->isEmpty() || $project->getId() === 'console') {
-        return $dbForPlatform;
+        return $dbForConsole;
    }

    try {
@@ -1467,9 +1440,9 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForPlatform
    }

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

-App::setResource('dbForPlatform', function (Group $pools, Cache $cache) {
+App::setResource('dbForConsole', function (Group $pools, Cache $cache) {
    $dbAdapter = $pools
        ->get('console')
        ->pop()
@@ -1487,12 +1460,12 @@ App::setResource('dbForPlatform', function (Group $pools, Cache $cache) {
    return $database;
 }, ['pools', 'cache']);

-App::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache) {
+App::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 {
@@ -1541,7 +1514,7 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform

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

 App::setResource('cache', function (Group $pools) {
    $list = Config::getParam('pools-cache', []);
@@ -1558,27 +1531,6 @@ App::setResource('cache', function (Group $pools) {
    return new Cache(new Sharding($adapters));
 }, ['pools']);

-App::setResource('redis', function () {
-    $host = System::getEnv('_APP_REDIS_HOST', 'localhost');
-    $port = System::getEnv('_APP_REDIS_PORT', 6379);
-    $pass = System::getEnv('_APP_REDIS_PASS', '');
-
-    $redis = new \Redis();
-    @$redis->pconnect($host, (int)$port);
-    if ($pass) {
-        $redis->auth($pass);
-    }
-    $redis->setOption(\Redis::OPT_READ_TIMEOUT, -1);
-
-    return $redis;
-});
-
-App::setResource('timelimit', function (\Redis $redis) {
-    return function (string $key, int $limit, int $time) use ($redis) {
-        return new TimeLimitRedis($key, $limit, $time, $redis);
-    };
-}, ['redis']);
-
 App::setResource('deviceForLocal', function () {
    return new Local();
 });
@@ -1844,11 +1796,7 @@ App::setResource('plan', function (array $plan = []) {
    return [];
 });

-App::setResource('smsRates', function () {
-    return [];
-});
-
-App::setResource('team', function (Document $project, Database $dbForPlatform, App $utopia, Request $request) {
+App::setResource('team', function (Document $project, Database $dbForConsole, App $utopia, Request $request) {
    $teamInternalId = '';
    if ($project->getId() !== 'console') {
        $teamInternalId = $project->getAttribute('teamInternalId', '');
@@ -1858,36 +1806,25 @@ App::setResource('team', function (Document $project, Database $dbForPlatform, A
        if (str_starts_with($path, '/v1/projects/:projectId')) {
            $uri = $request->getURI();
            $pid = explode('/', $uri)[3];
-            $p = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $pid));
+            $p = Authorization::skip(fn () => $dbForConsole->getDocument('projects', $pid));
            $teamInternalId = $p->getAttribute('teamInternalId', '');
        } elseif ($path === '/v1/projects') {
            $teamId = $request->getParam('teamId', '');
-            $team = Authorization::skip(fn () => $dbForPlatform->getDocument('teams', $teamId));
+            $team = Authorization::skip(fn () => $dbForConsole->getDocument('teams', $teamId));
            return $team;
        }
    }

-    $team = Authorization::skip(function () use ($dbForPlatform, $teamInternalId) {
-        return $dbForPlatform->findOne('teams', [
+    $team = Authorization::skip(function () use ($dbForConsole, $teamInternalId) {
+        return $dbForConsole->findOne('teams', [
            Query::equal('$internalId', [$teamInternalId]),
        ]);
    });

    return $team;
-}, ['project', 'dbForPlatform', 'utopia', 'request']);
+}, ['project', 'dbForConsole', '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']);
@@ -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;
@@ -138,32 +138,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 +167,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 +184,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 +481,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 +490,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 +593,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 +678,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);
 });

@@ -163,14 +163,11 @@ $image = $this->getParam('image', '');
      - _APP_MIGRATIONS_FIREBASE_CLIENT_ID
      - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
      - _APP_ASSISTANT_OPENAI_API_KEY
-      - _APP_SLOW_QUERIES_MAX_HITS
-      - _APP_SLOW_QUERIES_TIMEOUT
-      - _APP_SLOW_QUERIES

  appwrite-console:
    <<: *x-logging
    container_name: appwrite-console
-    image: <?php echo $organization; ?>/console:5.2.27
+    image: <?php echo $organization; ?>/console:5.0.12
    restart: unless-stopped
    networks:
      - appwrite
@@ -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;
@@ -17,7 +16,7 @@ use Appwrite\Event\Usage;
 use Appwrite\Event\UsageDump;
 use Appwrite\Platform\Appwrite;
 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;
@@ -42,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')
@@ -55,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'] ?? []);

@@ -63,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');
@@ -109,14 +108,14 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
    }

    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 {
@@ -171,10 +170,10 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatf

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

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

 Server::setResource('auditRetention', function () {
@@ -201,27 +200,6 @@ 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('queueForUsage', function (Connection $queue) {
@@ -305,15 +283,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');
@@ -323,7 +292,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());
@@ -416,7 +385,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());
@@ -30,7 +30,7 @@
        }
    },
    "require": {
-        "php": ">=8.3",
+        "php": ">=8.0.0",
        "ext-curl": "*",
        "ext-imagick": "*",
        "ext-mbstring": "*",
@@ -45,24 +45,24 @@
        "ext-sockets": "*",
        "appwrite/php-runtimes": "0.16.*",
        "appwrite/php-clamav": "2.0.*",
-        "utopia-php/abuse": "0.47.*",
+        "utopia-php/abuse": "0.43.*",
        "utopia-php/analytics": "0.10.*",
-        "utopia-php/audit": "0.47.*",
+        "utopia-php/audit": "0.43.*",
        "utopia-php/cache": "0.11.*",
        "utopia-php/cli": "0.15.*",
        "utopia-php/config": "0.2.*",
-        "utopia-php/database": "0.56.4",
+        "utopia-php/database": "0.53.20",
        "utopia-php/domains": "0.5.*",
        "utopia-php/dsn": "0.2.1",
        "utopia-php/framework": "0.33.*",
-        "utopia-php/fetch": "0.3.*",
+        "utopia-php/fetch": "0.2.*",
        "utopia-php/image": "0.7.*",
        "utopia-php/locale": "0.4.*",
        "utopia-php/logger": "0.6.*",
-        "utopia-php/messaging": "0.14.*",
+        "utopia-php/messaging": "0.12.*",
        "utopia-php/migration": "0.6.*",
        "utopia-php/orchestration": "0.9.*",
-        "utopia-php/platform": "0.7.1",
+        "utopia-php/platform": "0.7.*",
        "utopia-php/pools": "0.5.*",
        "utopia-php/preloader": "0.2.*",
        "utopia-php/queue": "0.7.*",
@@ -84,7 +84,7 @@
    },
    "require-dev": {
        "ext-fileinfo": "*",
-        "appwrite/sdk-generator": "0.39.32",
+        "appwrite/sdk-generator": "0.39.*",
        "phpunit/phpunit": "9.5.20",
        "swoole/ide-helper": "5.1.2",
        "textalk/websocket": "1.5.7",
@@ -195,15 +195,11 @@ services:
      - _APP_DATABASE_SHARED_TABLES
      - _APP_DATABASE_SHARED_TABLES_V1
      - _APP_DATABASE_SHARED_NAMESPACE
-      - _APP_FUNCTIONS_CREATION_ABUSE_LIMIT
-      - _APP_SLOW_QUERIES_MAX_HITS
-      - _APP_SLOW_QUERIES_TIMEOUT
-      - _APP_SLOW_QUERIES

  appwrite-console:
    <<: *x-logging
    container_name: appwrite-console
-    image: appwrite/console:5.2.27
+    image: appwrite/console:5.0.12
    restart: unless-stopped
    networks:
      - appwrite
@@ -389,7 +385,6 @@ services:
      - _APP_EXECUTOR_HOST
      - _APP_DATABASE_SHARED_TABLES
      - _APP_DATABASE_SHARED_TABLES_V1
-      - _APP_EMAIL_CERTIFICATES

  appwrite-worker-databases:
    entrypoint: worker-databases
@@ -872,7 +867,7 @@ services:

  appwrite-assistant:
    container_name: appwrite-assistant
-    image: appwrite/assistant:0.7.0
+    image: appwrite/assistant:0.5.0
    networks:
      - appwrite
    environment:
@@ -12,6 +12,5 @@ mutation {
        providerId
        providerType
        identifier
-        expired
    }
 }
@@ -33,7 +33,6 @@ mutation {
            providerId
            providerType
            identifier
-            expired
        }
        accessedAt
    }
@@ -28,7 +28,6 @@ query {
            providerId
            providerType
            identifier
-            expired
        }
        accessedAt
    }
@@ -31,7 +31,6 @@ mutation {
            providerId
            providerType
            identifier
-            expired
        }
        accessedAt
    }
@@ -30,7 +30,6 @@ mutation {
            providerId
            providerType
            identifier
-            expired
        }
        accessedAt
    }
@@ -31,7 +31,6 @@ mutation {
            providerId
            providerType
            identifier
-            expired
        }
        accessedAt
    }
@@ -30,7 +30,6 @@ mutation {
            providerId
            providerType
            identifier
-            expired
        }
        accessedAt
    }
@@ -31,7 +31,6 @@ mutation {
            providerId
            providerType
            identifier
-            expired
        }
        accessedAt
    }
@@ -31,7 +31,6 @@ mutation {
            providerId
            providerType
            identifier
-            expired
        }
        accessedAt
    }
@@ -30,7 +30,6 @@ mutation {
            providerId
            providerType
            identifier
-            expired
        }
        accessedAt
    }
@@ -11,6 +11,5 @@ mutation {
        providerId
        providerType
        identifier
-        expired
    }
 }
@@ -28,7 +28,6 @@ mutation {
            providerId
            providerType
            identifier
-            expired
        }
        accessedAt
    }
@@ -17,7 +17,6 @@ mutation {
            providerId
            providerType
            identifier
-            expired
        }
        userId
        userName
@@ -3,5 +3,4 @@ appwrite databases updateBooleanAttribute \
        --collectionId <COLLECTION_ID> \
        --key '' \
        --required false \
-        --default false \
-
+        --default false
@@ -3,5 +3,4 @@ appwrite databases updateDatetimeAttribute \
        --collectionId <COLLECTION_ID> \
        --key '' \
        --required false \
-        --default '' \
-
+        --default ''
@@ -3,5 +3,4 @@ appwrite databases updateEmailAttribute \
        --collectionId <COLLECTION_ID> \
        --key '' \
        --required false \
-        --default email@example.com \
-
+        --default email@example.com
@@ -4,5 +4,4 @@ appwrite databases updateEnumAttribute \
        --key '' \
        --elements one two three \
        --required false \
-        --default <DEFAULT> \
-
+        --default <DEFAULT>
@@ -5,5 +5,4 @@ appwrite databases updateFloatAttribute \
        --required false \
        --min null \
        --max null \
-        --default null \
-
+        --default null
@@ -5,5 +5,4 @@ appwrite databases updateIntegerAttribute \
        --required false \
        --min null \
        --max null \
-        --default null \
-
+        --default null
@@ -3,5 +3,4 @@ appwrite databases updateIpAttribute \
        --collectionId <COLLECTION_ID> \
        --key '' \
        --required false \
-        --default '' \
-
+        --default ''
@@ -3,4 +3,3 @@ appwrite databases updateRelationshipAttribute \
        --collectionId <COLLECTION_ID> \
        --key '' \

-
@@ -3,6 +3,4 @@ appwrite databases updateStringAttribute \
        --collectionId <COLLECTION_ID> \
        --key '' \
        --required false \
-        --default <DEFAULT> \
-
-
+        --default <DEFAULT>
@@ -3,5 +3,4 @@ appwrite databases updateUrlAttribute \
        --collectionId <COLLECTION_ID> \
        --key '' \
        --required false \
-        --default https://example.com \
-
+        --default https://example.com
@@ -1,10 +1,7 @@
 appwrite messaging createPush \
        --messageId <MESSAGE_ID> \
-
-
-
-
-
+        --title <TITLE> \
+        --body <BODY> \



@@ -15,6 +15,3 @@ appwrite messaging updatePush \



-
-
-
@@ -1,5 +0,0 @@
-appwrite projects updateMembershipsPrivacy \
-        --projectId <PROJECT_ID> \
-        --userName false \
-        --userEmail false \
-        --mfa false
@@ -12,7 +12,7 @@ const result = await databases.updateStringAttribute(
    '', // key
    false, // required
    '<DEFAULT>', // default
-    1, // size (optional)
+    null, // size (optional)
    '' // newKey (optional)
 );

@@ -1,4 +1,4 @@
-import { Client, Messaging, MessagePriority } from "@appwrite.io/console";
+import { Client, Messaging } from "@appwrite.io/console";

 const client = new Client()
    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
@@ -8,8 +8,8 @@ const messaging = new Messaging(client);

 const result = await messaging.createPush(
    '<MESSAGE_ID>', // messageId
-    '<TITLE>', // title (optional)
-    '<BODY>', // body (optional)
+    '<TITLE>', // title
+    '<BODY>', // body
    [], // topics (optional)
    [], // users (optional)
    [], // targets (optional)
@@ -20,12 +20,9 @@ const result = await messaging.createPush(
    '<SOUND>', // sound (optional)
    '<COLOR>', // color (optional)
    '<TAG>', // tag (optional)
-    null, // badge (optional)
+    '<BADGE>', // badge (optional)
    false, // draft (optional)
-    '', // scheduledAt (optional)
-    false, // contentAvailable (optional)
-    false, // critical (optional)
-    MessagePriority.Normal // priority (optional)
+    '' // scheduledAt (optional)
 );

 console.log(result);
@@ -1,4 +1,4 @@
-import { Client, Messaging, MessagePriority } from "@appwrite.io/console";
+import { Client, Messaging } from "@appwrite.io/console";

 const client = new Client()
    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
@@ -22,10 +22,7 @@ const result = await messaging.updatePush(
    '<TAG>', // tag (optional)
    null, // badge (optional)
    false, // draft (optional)
-    '', // scheduledAt (optional)
-    false, // contentAvailable (optional)
-    false, // critical (optional)
-    MessagePriority.Normal // priority (optional)
+    '' // scheduledAt (optional)
 );

 console.log(result);
@@ -1,16 +0,0 @@
-import { Client, Projects } from "@appwrite.io/console";
-
-const client = new Client()
-    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
-    .setProject('<YOUR_PROJECT_ID>'); // Your project ID
-
-const projects = new Projects(client);
-
-const result = await projects.updateMembershipsPrivacy(
-    '<PROJECT_ID>', // projectId
-    false, // userName
-    false, // userEmail
-    false // mfa
-);
-
-console.log(result);
@@ -13,6 +13,6 @@ AttributeString result = await databases.updateStringAttribute(
    key: '',
    xrequired: false,
    xdefault: '<DEFAULT>',
-    size: 1, // (optional)
+    size: 0, // (optional)
    newKey: '', // (optional)
 );
@@ -9,8 +9,8 @@ Messaging messaging = Messaging(client);

 Message result = await messaging.createPush(
    messageId: '<MESSAGE_ID>',
-    title: '<TITLE>', // (optional)
-    body: '<BODY>', // (optional)
+    title: '<TITLE>',
+    body: '<BODY>',
    topics: [], // (optional)
    users: [], // (optional)
    targets: [], // (optional)
@@ -21,10 +21,7 @@ Message result = await messaging.createPush(
    sound: '<SOUND>', // (optional)
    color: '<COLOR>', // (optional)
    tag: '<TAG>', // (optional)
-    badge: 0, // (optional)
+    badge: '<BADGE>', // (optional)
    draft: false, // (optional)
    scheduledAt: '', // (optional)
-    contentAvailable: false, // (optional)
-    critical: false, // (optional)
-    priority: MessagePriority.normal, // (optional)
 );
@@ -24,7 +24,4 @@ Message result = await messaging.updatePush(
    badge: 0, // (optional)
    draft: false, // (optional)
    scheduledAt: '', // (optional)
-    contentAvailable: false, // (optional)
-    critical: false, // (optional)
-    priority: MessagePriority.normal, // (optional)
 );
@@ -13,6 +13,6 @@ const response = await databases.updateStringAttribute(
    '', // key
    false, // required
    '<DEFAULT>', // default
-    1, // size (optional)
+    null, // size (optional)
    '' // newKey (optional)
 );
@@ -1,4 +1,4 @@
-import { Client, Messaging, MessagePriority } from "https://deno.land/x/appwrite/mod.ts";
+import { Client, Messaging } from "https://deno.land/x/appwrite/mod.ts";

 const client = new Client()
    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
@@ -9,8 +9,8 @@ const messaging = new Messaging(client);

 const response = await messaging.createPush(
    '<MESSAGE_ID>', // messageId
-    '<TITLE>', // title (optional)
-    '<BODY>', // body (optional)
+    '<TITLE>', // title
+    '<BODY>', // body
    [], // topics (optional)
    [], // users (optional)
    [], // targets (optional)
@@ -21,10 +21,7 @@ const response = await messaging.createPush(
    '<SOUND>', // sound (optional)
    '<COLOR>', // color (optional)
    '<TAG>', // tag (optional)
-    null, // badge (optional)
+    '<BADGE>', // badge (optional)
    false, // draft (optional)
-    '', // scheduledAt (optional)
-    false, // contentAvailable (optional)
-    false, // critical (optional)
-    MessagePriority.Normal // priority (optional)
+    '' // scheduledAt (optional)
 );
@@ -1,4 +1,4 @@
-import { Client, Messaging, MessagePriority } from "https://deno.land/x/appwrite/mod.ts";
+import { Client, Messaging } from "https://deno.land/x/appwrite/mod.ts";

 const client = new Client()
    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
@@ -23,8 +23,5 @@ const response = await messaging.updatePush(
    '<TAG>', // tag (optional)
    null, // badge (optional)
    false, // draft (optional)
-    '', // scheduledAt (optional)
-    false, // contentAvailable (optional)
-    false, // critical (optional)
-    MessagePriority.Normal // priority (optional)
+    '' // scheduledAt (optional)
 );
@@ -15,6 +15,6 @@ AttributeString result = await databases.UpdateStringAttribute(
    key: "",
    required: false,
    default: "<DEFAULT>",
-    size: 1, // optional
+    size: 0, // optional
    newKey: "" // optional
 );
@@ -1,5 +1,4 @@
 using Appwrite;
-using Appwrite.Enums;
 using Appwrite.Models;
 using Appwrite.Services;

@@ -12,8 +11,8 @@ Messaging messaging = new Messaging(client);

 Message result = await messaging.CreatePush(
    messageId: "<MESSAGE_ID>",
-    title: "<TITLE>", // optional
-    body: "<BODY>", // optional
+    title: "<TITLE>",
+    body: "<BODY>",
    topics: new List<string>(), // optional
    users: new List<string>(), // optional
    targets: new List<string>(), // optional
@@ -24,10 +23,7 @@ Message result = await messaging.CreatePush(
    sound: "<SOUND>", // optional
    color: "<COLOR>", // optional
    tag: "<TAG>", // optional
-    badge: 0, // optional
+    badge: "<BADGE>", // optional
    draft: false, // optional
-    scheduledAt: "", // optional
-    contentAvailable: false, // optional
-    critical: false, // optional
-    priority: MessagePriority.Normal // optional
+    scheduledAt: "" // optional
 );
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
loks0n	633e898042	default spec	2024-11-22 17:18:19 +00:00
Christy Jacob	a7faf656a8	Merge branch '1.6.x' of github.com:appwrite/appwrite into feat-custom-cf-hostnames	2024-11-22 12:42:38 +04:00
Jake Barnby	e1b71df757	Merge remote-tracking branch 'origin/1.6.x' into feat-custom-cf-hostnames	2024-11-21 22:44:24 +13:00
Jake Barnby	b673c54cf9	Merge branch '1.6.x' into feat-custom-cf-hostnames	2024-11-21 14:25:14 +13:00
Jake Barnby	2f77d53380	Merge remote-tracking branch 'origin/1.6.x' into feat-custom-cf-hostnames	2024-11-21 14:20:28 +13:00
Jake Barnby	e276532950	Merge branch '1.6.x' into feat-custom-cf-hostnames	2024-11-21 14:09:42 +13:00
Fabian Gruber	d32a1c35ab	chore: update base to 0.9.5	2024-11-19 17:20:09 +01:00
Christy JacobandGitHub	218598e856	Merge pull request #9004 from appwrite/revert-8962-feat-fix-web-routes Revert "feat fix web routes"	2024-11-19 10:38:51 +01:00
Christy JacobandGitHub	fc3fa77056	Revert "feat fix web routes"	2024-11-19 13:35:37 +04:00
Christy JacobandGitHub	9a7e5a3153	Merge pull request #8988 from appwrite/fix-deletes Fix project type delete checks	2024-11-15 13:14:14 +01:00
Jake Barnby	a470e2b517	Output test mode	2024-11-15 18:55:52 +13:00
Jake Barnby	6851461a3b	Fix workflow	2024-11-15 18:40:06 +13:00
Jake Barnby	24079a836b	Fix project type delete checks	2024-11-15 18:37:16 +13:00
Fabian Gruber	a3bd8b1e4e	Merge branch '1.6.x' into feat-custom-cf-hostnames	2024-11-13 14:11:49 +01:00
Christy JacobandGitHub	69b4ef4df1	Merge pull request #8964 from appwrite/debug-whitelist-console debug: whitelist console	2024-11-12 17:51:57 +01:00
loks0n	dad8f597ca	debug: whitelist console	2024-11-12 16:05:51 +01:00
Luke B. SilverandGitHub	90f18c57ac	Merge pull request #8962 from appwrite/feat-fix-web-routes feat fix web routes	2024-11-12 12:42:30 +01:00
loks0n	6e7dd26f75	feat: fix web routes	2024-11-12 12:37:15 +01:00
Christy JacobandGitHub	9151abc951	Merge pull request #8797 from appwrite/feat-migration Feat migration	2024-11-12 10:27:24 +01:00
Jake Barnby	714f6b62ac	Merge remote-tracking branch 'origin/feat-custom-cf-hostnames' into feat-migration	2024-11-12 21:45:04 +13:00
Jake Barnby	316693798e	Merge remote-tracking branch 'origin/1.6.x' into feat-custom-cf-hostnames	2024-11-12 21:44:50 +13:00
Jake Barnby	c7f92fbb02	Merge remote-tracking branch 'origin/feat-custom-cf-hostnames' into feat-migration	2024-11-12 21:43:52 +13:00
Jake Barnby	e715f9e90c	Remove redundant V1 tests	2024-11-12 20:52:25 +13:00
Jake Barnby	f6ea6d2fc5	Fix matrix	2024-11-12 19:15:33 +13:00
Jake Barnby	e626c2ad45	Run in all table modes in parallel	2024-11-12 19:14:46 +13:00
Jake Barnby	3b19ef6b1e	Remove V2 tests	2024-11-12 15:00:23 +13:00
Jake Barnby	c1a3b29a97	Temp test all shared tables versions	2024-11-12 14:37:03 +13:00
Jake Barnby	aa2385ffb9	Merge branch 'revert-revert-8946-chore-update-database' into feat-migration # Conflicts: # composer.json # composer.lock	2024-11-12 13:36:05 +13:00
Jake Barnby	8b99517dd0	Merge remote-tracking branch 'origin/1.6.x' into feat-migration	2024-11-12 13:34:54 +13:00
Jake Barnby	33037a3ae5	Update database	2024-11-12 13:34:40 +13:00
Jake Barnby	b0852aeca3	Update database	2024-11-11 23:15:00 +13:00
Jake Barnby	09da4378c6	Merge remote-tracking branch 'origin/1.6.x' into feat-migration	2024-11-11 23:13:35 +13:00
Jake Barnby	a85b43654c	Reapply "Update database" This reverts commit `b1a1ad618a`.	2024-11-11 15:22:57 +13:00
Christy Jacob	76216c3bf6	Merge branch '1.6.x' of https://github.com/appwrite/appwrite into feat-custom-cf-hostnames	2024-11-09 16:01:16 +00:00
loks0n	c8c4576bbc	Merge branch '1.6.x' of https://github.com/appwrite/appwrite into feat-custom-cf-hostnames	2024-11-09 13:07:15 +01:00
loks0n	dac8766eb4	Merge branch '1.6.x' of https://github.com/appwrite/appwrite into feat-custom-cf-hostnames	2024-11-08 22:02:31 +01:00
loks0n	f6de256220	chore: composer update	2024-11-08 21:50:33 +01:00
loks0n	2f9b44930f	Revert "Merge pull request #8946 from appwrite/chore-update-database" This reverts commit `c0bd1664be`, reversing changes made to `b42dd86451`.	2024-11-08 21:48:27 +01:00
loks0n	627df0d11f	chore: remove redundant compression	2024-11-08 20:24:55 +01:00
loks0n	fcd323baa4	Merge branch '1.6.x' of https://github.com/appwrite/appwrite into feat-custom-cf-hostnames	2024-11-08 20:24:35 +01:00
loks0n	0009b73b06	Merge branch '1.6.x' of https://github.com/appwrite/appwrite into feat-custom-cf-hostnames	2024-11-08 16:53:22 +01:00
Jake Barnby	030e26b223	Merge remote-tracking branch 'origin/1.6.x' into feat-custom-cf-hostnames	2024-11-08 23:33:10 +13:00
Jake Barnby	9e69e41e02	Update lock	2024-11-08 17:04:29 +13:00
Jake Barnby	773fa6ffd6	Update lock	2024-11-08 16:34:07 +13:00
Jake Barnby	21bff77c50	Merge remote-tracking branch 'origin/feat-custom-cf-hostnames' into feat-migration # Conflicts: # composer.json # composer.lock	2024-11-08 16:32:55 +13:00
loks0n	472f167b4a	Merge branch '1.6.x' of https://github.com/appwrite/appwrite into feat-custom-cf-hostnames	2024-11-07 20:31:41 +01:00
Fabian Gruber	b4c986839e	Merge branch '1.6.x' into feat-custom-cf-hostnames	2024-11-06 12:40:56 +01:00
Damodar LohaniandGitHub	d425c9f071	Merge pull request #8930 from appwrite/pathc-update-utopia-storage upgrade utopia storage	2024-11-06 16:01:56 +05:45
Damodar Lohani	e219ee2d84	upgrade utopia storage	2024-11-06 10:02:11 +00:00
Jake Barnby	e66d0216c6	Merge remote-tracking branch 'origin/1.6.x' into feat-custom-cf-hostnames	2024-11-06 17:02:06 +13:00
Steven NguyenandGitHub	e3e20d2923	Merge pull request #8922 from appwrite/lohanidamodar-patch-4 Improve compression param checks	2024-11-05 17:35:39 -08:00
loks0n	e0c503e249	Merge branch '1.6.x' of https://github.com/appwrite/appwrite into feat-custom-cf-hostnames	2024-11-05 19:47:29 +01:00
Jake Barnby	228cabab3a	Merge remote-tracking branch 'origin/1.6.x' into feat-custom-cf-hostnames	2024-11-05 23:38:24 +13:00
Damodar Lohani	028c5366c2	make compression nullable and assign default in action - also update the `update bucket` endpoint	2024-11-05 08:12:58 +00:00
Damodar LohaniandGitHub	cca0c3ae45	Make compression param whitelist strict	2024-11-05 12:59:11 +05:45
Jake Barnby	0b85a64dab	Merge remote-tracking branch 'origin/1.6.x' into feat-custom-cf-hostnames	2024-11-04 22:44:25 +13:00
Jake Barnby	1633acbdc3	Merge remote-tracking branch 'origin/feat-custom-cf-hostnames' into feat-migration # Conflicts: # composer.json # composer.lock	2024-11-01 16:16:06 +13:00
Jake BarnbyandGitHub	75e8635563	Merge pull request #8904 from appwrite/1.6.x Merge 1.6.x into feat-custom-cf-hostnames	2024-10-31 22:12:38 +13:00
Jake Barnby	83e94629dc	Merge remote-tracking branch 'origin/feat-custom-cf-hostnames' into feat-migration	2024-10-31 21:49:49 +13:00
Fabian Gruber	6e3160c502	Merge branch '1.6.x' into feat-custom-cf-hostnames	2024-10-29 16:15:54 +01:00
Fabian Gruber	104ec3188f	Merge branch '1.6.x' into feat-custom-cf-hostnames	2024-10-29 15:36:38 +01:00
Fabian Gruber	b47a4703c4	Merge branch '1.6.x' into feat-custom-cf-hostnames	2024-10-25 13:39:12 +02:00
Fabian Gruber	4ceff430f9	Merge branch '1.6.x' into feat-custom-cf-hostnames	2024-10-24 12:49:26 +02:00
Christy JacobandGitHub	5603516d88	Merge branch '1.6.x' into feat-custom-cf-hostnames	2024-10-23 23:56:43 +04:00
Jake Barnby	013d95ebf3	Update audit and abuse	2024-10-23 18:42:00 +13:00
Jake Barnby	eca8d116c2	Fix attributes	2024-10-23 18:10:41 +13:00
Jake Barnby	8210808db0	Improve logic	2024-10-23 18:00:06 +13:00
Jake Barnby	4a003f2826	Force create audit/abuse metadata documents for shared tables v1	2024-10-23 17:41:44 +13:00
Christy Jacob	54f39494c0	Merge branch '1.6.x' of https://github.com/appwrite/appwrite into feat-custom-cf-hostnames	2024-10-22 19:51:03 +00:00
Christy Jacob	ae4edf119f	chore: linter	2024-10-22 19:49:10 +00:00
Fabian GruberandChristy Jacob	a56293e018	chore: replace 'Expires' with 'Cache-Control: private' header to avoid CDN caching	2024-10-22 12:18:58 +00:00
Jake Barnby	a0c58317bd	Merge remote-tracking branch 'origin/1.6.x' into feat-migration # Conflicts: # composer.json # composer.lock	2024-10-22 15:13:45 +13:00
Jake Barnby	d979c0c914	Create metadata document from outside if duplicate on shared tables V1	2024-10-21 22:43:47 +13:00
Christy Jacob	5ea83b8827	chore: update cert generation	2024-10-18 23:45:42 +00:00
Christy Jacob	6fe7d92fea	chore: update cert generation	2024-10-18 22:32:03 +00:00
Christy Jacob	28b02a4ba8	chore: fix bug	2024-10-18 21:18:20 +00:00
Christy Jacob	f4d456fa4c	chore: updat certs logic	2024-10-18 20:52:29 +00:00
Fabian Gruber	687252b15b	fix adding custom hostname & error logging	2024-10-18 22:21:53 +02:00
Fabian Gruber	f21b1c87a6	fix missing ssl object	2024-10-18 22:07:36 +02:00
Fabian Gruber	ccbde6c470	fix zone id	2024-10-18 21:44:36 +02:00
Torsten Dittmann	f189c41421	temp: custom cloudflare hostnames	2024-10-18 21:39:16 +02:00
Jake BarnbyandGitHub	5fcb990b1c	Merge branch '1.6.x' into feat-migration	2024-10-15 21:17:15 +13:00
Jake Barnby	30bd25d134	Update lock	2024-10-15 20:19:19 +13:00
Jake Barnby	36d2b84301	Update lock	2024-10-15 18:09:54 +13:00
Jake Barnby	78b9be2e78	Lint	2024-10-14 14:55:18 +13:00
Jake Barnby	a3b7cf84d5	Allow shared tables V1 and V2	2024-10-14 14:50:56 +13:00
Jake Barnby	add6a60af4	Remove redundant files	2024-10-14 14:33:53 +13:00
Jake Barnby	4543c182b5	Merge remote-tracking branch 'origin/1.6.x' into feat-migration # Conflicts: # Dockerfile # composer.json # composer.lock # src/Appwrite/Platform/Workers/Deletes.php	2024-10-14 14:29:04 +13:00
Jake Barnby	d18a67e6d8	Update packages	2024-09-12 23:06:47 +12:00
Jake Barnby	25d44b5b4c	Update generator	2024-09-12 23:04:44 +12:00
Jake Barnby	ee7de0cb41	Update database	2024-09-12 23:02:12 +12:00
Jake Barnby	28642b9f04	Shared tables array	2024-09-12 17:06:16 +12:00
Jake Barnby	c18308c024	Update database	2024-08-27 17:43:29 +12:00
Jake Barnby	1eafbf2ee2	Update database	2024-08-19 21:21:20 +12:00
Jake Barnby	b98bcdd4a1	Update database	2024-08-19 18:27:45 +12:00
Jake Barnby	4c8cd5b6c6	Update audit, abuse, database	2024-08-19 14:52:15 +12:00
Jake Barnby	5b37a91b46	Merge remote-tracking branch 'origin/1.5.x' into feat-migration	2024-08-13 22:11:18 +12:00
Jake Barnby	52647cef23	Merge remote-tracking branch 'origin/feat-single-shared-metadata-docs' into feat-migration # Conflicts: # composer.json # composer.lock	2024-08-13 22:10:57 +12:00
Jake Barnby	11ec31aefb	Update database	2024-08-13 21:49:25 +12:00
Jake Barnby	73ca1efbeb	Catch duplicate db on project create	2024-08-13 21:49:14 +12:00
Jake Barnby	340aa48d93	Catch duplicate on console db create	2024-08-13 21:14:52 +12:00
Jake Barnby	8ff72b341e	Don't set tenant for project collections creation	2024-08-12 23:46:34 +12:00
Jake Barnby	a23402075e	Update database	2024-08-12 17:45:43 +12:00
Jake Barnby	6b86ed0117	Merge remote-tracking branch 'origin/1.5.x' into feat-migration # Conflicts: # composer.lock	2024-08-07 22:10:04 +12:00
Jake Barnby	e2a45cec8e	Merge branch '1.5.x' into feat-migration # Conflicts: # composer.json # composer.lock	2024-08-05 21:13:42 +12:00
Jake Barnby	ec2eb2bfa3	Revert to utopia database instead of extension	2024-07-02 19:10:02 +12:00
Jake Barnby	10adfc5124	Add mirror override	2024-07-02 14:55:13 +12:00
Jake Barnby	5f7aae0e60	Add missing import	2024-06-21 13:43:01 +12:00
Jake Barnby	4952608b8d	Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-migration	2024-06-21 13:39:51 +12:00
Jake Barnby	42ebefef92	Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-migration	2024-06-19 19:32:30 +12:00
Jake Barnby	03d33601b0	Override find	2024-06-14 13:08:30 +12:00