Update specs

Merge branch 'feat-runtime-controls-1.5.x' of https://github.com/appwrite/appwrite into feat-runtime-controls-1.5.x
Update test
2026-05-26 13:51:13 +00:00 · 2024-08-08 11:31:34 +09:00 · 2024-08-08 11:28:59 +09:00 · 2024-08-08 11:28:57 +09:00 · 2024-08-08 11:28:03 +09:00 · 2024-08-08 11:27:49 +09:00
149 changed files with 56020 additions and 278 deletions
@@ -9,7 +9,8 @@ _APP_CONSOLE_COUNTRIES_DENYLIST=AQ
 _APP_CONSOLE_HOSTNAMES=localhost,appwrite.io,*.appwrite.io
 _APP_SYSTEM_EMAIL_NAME=Appwrite
 _APP_SYSTEM_EMAIL_ADDRESS=team@appwrite.io
-_APP_SYSTEM_SECURITY_EMAIL_ADDRESS=security@appwrite.io
+_APP_EMAIL_SECURITY=security@appwrite.io
+_APP_EMAIL_CERTIFICATES=certificates@appwrite.io
 _APP_SYSTEM_RESPONSE_FORMAT=
 _APP_OPTIONS_ABUSE=disabled
 _APP_OPTIONS_ROUTER_PROTECTION=disabled
@@ -66,7 +67,7 @@ _APP_STORAGE_PREVIEW_LIMIT=20000000
 _APP_FUNCTIONS_SIZE_LIMIT=30000000
 _APP_FUNCTIONS_TIMEOUT=900
 _APP_FUNCTIONS_BUILD_TIMEOUT=900
-_APP_FUNCTIONS_CPUS=1
+_APP_FUNCTIONS_CPUS=2
 _APP_FUNCTIONS_MEMORY=1024
 _APP_FUNCTIONS_INACTIVE_THRESHOLD=600
 _APP_FUNCTIONS_MAINTENANCE_INTERVAL=600
@@ -1,4 +1,4 @@
 [submodule "app/console"]
 	path = app/console
 	url = https://github.com/appwrite/console
-	branch = 4.3.5
+	branch = 4.3.23
@@ -1,3 +1,37 @@
+# Version 1.5.8
+
+## What's Changed
+
+### Notable changes
+
+* Support Twilio messaging service SID in [8222](https://github.com/appwrite/appwrite/pull/8222)
+* Improve cache performance in [8230](https://github.com/appwrite/appwrite/pull/8230)
+* Add hk in translations in [8179](https://github.com/appwrite/appwrite/pull/8179)
+* Bump console to version 4.3.14 in [8321](https://github.com/appwrite/appwrite/pull/8321)
+* Update pwd abuse in [8255](https://github.com/appwrite/appwrite/pull/8255)
+
+### Fixes
+
+* Ensure usage is counted for errors in [8120](https://github.com/appwrite/appwrite/pull/8120)
+* Fix MFA for OAuth2 only accounts in [8245](https://github.com/appwrite/appwrite/pull/8245)
+* Delete Expired Targets Per Project in [8239](https://github.com/appwrite/appwrite/pull/8239)
+* Don't set the target field if the existing target document is false in [8236](https://github.com/appwrite/appwrite/pull/8236)
+* Disable validation for project DBs during migration in [8298](https://github.com/appwrite/appwrite/pull/8298)
+* Add `default` to Collection Attributes in Migration in [8271](https://github.com/appwrite/appwrite/pull/8271)
+* Fix Create bucket endpoint validator for maximum file size in [8275](https://github.com/appwrite/appwrite/pull/8275)
+* Disable validation for subquery to prevent error in [8297](https://github.com/appwrite/appwrite/pull/8297)
+* Fix 'Missing required attribute "expire"' on `users.createSession()` in [8308](https://github.com/appwrite/appwrite/pull/8308)
+
+### Miscellaneous
+
+* Bump base image from 0.9.0 to 0.9.1 in [8238](https://github.com/appwrite/appwrite/pull/8238)
+* Use latest Platform and add Core module in [7936](https://github.com/appwrite/appwrite/pull/7936)
+* Add Test to Validate Headers aren't Overridden in [8228](https://github.com/appwrite/appwrite/pull/8228)
+* Fix hyperlink in storage docs in [8269](https://github.com/appwrite/appwrite/pull/8269)
+* Update cache & database in [8285](https://github.com/appwrite/appwrite/pull/8285)
+* Fix flaky certificate test in [8316](https://github.com/appwrite/appwrite/pull/8316)
+* Fix flaky function test in [8317](https://github.com/appwrite/appwrite/pull/8317)
+
 # Version 1.5.7
 ## What's Changed

@@ -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.5.7
+    appwrite/appwrite:1.5.8
 ```

 ### 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.5.7
+    appwrite/appwrite:1.5.8
 ```

 #### 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.5.7
+    appwrite/appwrite:1.5.8
 ```

 运行后，可以在浏览器上访问 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.5.7
+    appwrite/appwrite:1.5.8
 ```

 ### 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.5.7
+    appwrite/appwrite:1.5.8
 ```

 #### 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.5.7
+    appwrite/appwrite:1.5.8
 ```

 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.
@@ -185,7 +185,6 @@ CLI::setResource('logError', function (Registry $register) {
            $log->addExtra('file', $error->getFile());
            $log->addExtra('line', $error->getLine());
            $log->addExtra('trace', $error->getTraceAsString());
-            $log->addExtra('detailedTrace', $error->getTrace());

            $log->setAction($action);

@@ -3054,7 +3054,18 @@ $projectCollections = array_merge([
                'required' => false,
                'default' => null,
                'filters' => [],
-            ]
+            ],
+            [
+                'array' => false,
+                '$id' => ID::custom('specification'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 128,
+                'signed' => false,
+                'required' => false,
+                'default' => APP_FUNCTION_BASE_SPECIFICATION,
+                'filters' => [],
+            ],
        ],
        'indexes' => [
            [
@@ -524,7 +524,6 @@ return [
        'description' => 'Synchronous function execution timed out. Use asynchronous execution instead, or ensure the execution duration doesn\'t exceed 30 seconds.',
        'code' => 408,
    ],
-
    /** Builds  */
    Exception::BUILD_NOT_FOUND => [
        'name' => Exception::BUILD_NOT_FOUND,
@@ -4,7 +4,9 @@
 <table border="0" cellspacing="0" cellpadding="0" style="padding-top: 10px; padding-bottom: 10px; display: inline-block;">
    <tr>
        <td align="center" style="border-radius: 8px; background-color: #ffffff;">
-            <p style="text-align: start; font-size: 14px; font-family: Inter; color: #414146; text-decoration: none; border-radius: 8px; padding: 32px; border: 1px solid #EDEDF0; display: inline-block; word-break: break-word;">{{error}}</p>
+            <p style="text-align: start; font-size: 14px; font-family: Inter; color: #414146; text-decoration: none; border-radius: 8px; padding: 32px; border: 1px solid #EDEDF0; display: inline-block; word-break: break-word;">
+                {{error}}
+            </p>
        </td>
    </tr>
 </table>
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Kroasië",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "غرينادا",
    "countries.gt": "غواتيمالا",
    "countries.gy": "غيانا",
+    "countries.hk": "هونغ كونغ",
    "countries.hn": "هندوراس",
    "countries.hr": "كرواتيا",
    "countries.ht": "هايتي",
@@ -100,6 +100,7 @@
    "countries.gd": "গ্ৰেনাডা",
    "countries.gt": "গুয়াতেমালা",
    "countries.gy": "গায়ানা",
+    "countries.hk": "হং কং",
    "countries.hn": "হণ্ডুৰাছ",
    "countries.hr": "ক্ৰোৱেছিয়া",
    "countries.ht": "হাইতি",
@@ -100,6 +100,7 @@
    "countries.gd": "Qrenada",
    "countries.gt": "Qvatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Honq Konq",
    "countries.hn": "Honduras",
    "countries.hr": "Xorvatiya",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Грэнада",
    "countries.gt": "Гватэмала",
    "countries.gy": "Гаяна",
+    "countries.hk": "Гонконг",
    "countries.hn": "Гандурас",
    "countries.hr": "Харватыя",
    "countries.ht": "Гаіці",
@@ -100,6 +100,7 @@
    "countries.gd": "Гренада",
    "countries.gt": "Гватемала",
    "countries.gy": "Гвиана",
+    "countries.hk": "Хонг Конг",
    "countries.hn": "Хондурас",
    "countries.hr": "Хърватия",
    "countries.ht": "Хаити",
@@ -100,6 +100,7 @@
    "countries.gd": "ग्रेनाडा",
    "countries.gt": "ग्वाटेमाला",
    "countries.gy": "गयाना",
+    "countries.hk": "हांगकांग",
    "countries.hn": "होंडुरस",
    "countries.hr": "क्रोएशिया",
    "countries.ht": "हैती",
@@ -100,6 +100,7 @@
    "countries.gd": "গ্রেনাডা",
    "countries.gt": "গুয়াতেমালা",
    "countries.gy": "গায়ানা",
+    "countries.hk": "হংকং",
    "countries.hn": "হন্ডুরাস",
    "countries.hr": "ক্রোয়েশিয়া",
    "countries.ht": "হাইতি",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Gvajana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Hrvatska",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Granada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guaiana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Hondures",
    "countries.hr": "Croàcia",
    "countries.ht": "Haití",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Chorvatsko",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Kroatien",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Kroatien",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Γρενάδα",
    "countries.gt": "Γουατεμάλα",
    "countries.gy": "Γουιάνα",
+    "countries.hk": "Χονγκ Κονγκ",
    "countries.hn": "Ονδούρα",
    "countries.hr": "Κροατία",
    "countries.ht": "Αϊτή",
@@ -43,6 +43,12 @@
    "emails.invitation.footer": "If you are not interested, you can ignore this message.",
    "emails.invitation.thanks": "Thanks",
    "emails.invitation.signature": "{{project}} team",
+    "emails.certificate.subject": "Certificate failure for %s",
+    "emails.certificate.hello": "Hello",
+    "emails.certificate.body": "Certificate for your domain '{{domain}}' could not be generated. This is attempt no. {{attempt}}, and the failure was caused by: {{error}}",
+    "emails.certificate.footer": "Your previous certificate will be valid for 30 days since the first failure. We highly recommend investigating this case, otherwise your domain will end up without a valid SSL communication.",
+    "emails.certificate.thanks": "Thanks",
+    "emails.certificate.signature": "{{project}} team",
    "sms.verification.body": "{{secret}}",
    "locale.country.unknown": "Unknown",
    "countries.af": "Afghanistan",
@@ -117,6 +123,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Croatia",
    "countries.ht": "Haiti",
@@ -99,6 +99,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Croatia",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Granada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guayana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Croacia",
    "countries.ht": "Haití",
@@ -100,6 +100,7 @@
    "countries.gd": "گرنادا",
    "countries.gt": "گواتمالا",
    "countries.gy": "گویان",
+    "countries.hk": "هنگ کنگ",
    "countries.hn": "هندوراس",
    "countries.hr": "کرواسی",
    "countries.ht": "هائیتی",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Kroatia",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Gujana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Kroatia",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenade",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyane",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Croatie",
    "countries.ht": "Haïti",
@@ -100,6 +100,7 @@
    "countries.gd": "Greanáda",
    "countries.gt": "Guatamala",
    "countries.gy": "An Ghuáin",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Hondúras",
    "countries.hr": "An Chróit",
    "countries.ht": "Háítí",
@@ -100,6 +100,7 @@
    "countries.gd": "ગ્રેનાડા",
    "countries.gt": "ગ્વાટેમાલા",
    "countries.gy": "ગુયાના",
+    "countries.hk": "હોંગ કોંગ",
    "countries.hn": "હોન્ડુરાસ",
    "countries.hr": "ક્રોએશિયા",
    "countries.ht": "હૈતી",
@@ -100,6 +100,7 @@
    "countries.gd": "גרנדה",
    "countries.gt": "גואטמלה",
    "countries.gy": "גיאנה",
+    "countries.hk": "הונג קונג",
    "countries.hn": "הונדורס",
    "countries.hr": "קרואטיה",
    "countries.ht": "האיטי",
@@ -100,6 +100,7 @@
    "countries.gd": "ग्रेनाडा",
    "countries.gt": "ग्वाटेमाला",
    "countries.gy": "गयाना",
+    "countries.hk": "हांग कांग",
    "countries.hn": "होंडुरस",
    "countries.hr": "क्रोएशिया",
    "countries.ht": "हैती",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Gvatemala",
    "countries.gy": "Gvajana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Hrvatska",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Horvátország",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Գրենադա",
    "countries.gt": "Գվատեմալա",
    "countries.gy": "Գայանա",
+    "countries.hk": "Հոնգ Կոնգ",
    "countries.hn": "Գոնդուրաս",
    "countries.hr": "Խորվաթիա",
    "countries.ht": "Հաիթի",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Kroasia",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Gvatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Hondúras",
    "countries.hr": "Króatía",
    "countries.ht": "Haítí",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Croazia",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "グレナダ",
    "countries.gt": "グアテマラ",
    "countries.gy": "ガイアナ",
+    "countries.hk": "香港",
    "countries.hn": "ホンジュラス",
    "countries.hr": "クロアチア",
    "countries.ht": "ハイチ",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Croatia",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "ហ្គ្រេណាដា",
    "countries.gt": "ហ្គាតេម៉ាឡា",
    "countries.gy": "ហ្គីយ៉ាណា",
+    "countries.hk": "ហុងកុង",
    "countries.hn": "ហុងឌូរ៉ាស",
    "countries.hr": "ក្រូអាត",
    "countries.ht": "ហៃទី",
@@ -100,6 +100,7 @@
    "countries.gd": "ಗ್ರೆನಡಾ",
    "countries.gt": "ಗ್ವಾಟೆಮಾಲಾ",
    "countries.gy": "ಗಯಾನಾ",
+    "countries.hk": "ಹಾಂಗ್ ಕಾಂಗ್",
    "countries.hn": "ಹೊಂಡುರಾಸ್",
    "countries.hr": "ಕ್ರೊಯೇಷಿಯಾ",
    "countries.ht": "ಹೈಟಿ",
@@ -100,6 +100,7 @@
    "countries.gd": "그레나다",
    "countries.gt": "과테말라",
    "countries.gy": "기아나",
+    "countries.hk": "홍콩",
    "countries.hn": "온두라스",
    "countries.hr": "크로아티아",
    "countries.ht": "아이티",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Croatia",
    "countries.ht": "Haiti",
@@ -250,4 +251,4 @@
    "emails.certificate.thanks": "Gratias",
    "emails.certificate.signature": "team {{project}}",
    "sms.verification.body": "{{secret}}"
-}
+}
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Gvatemala",
    "countries.gy": "Gajana",
+    "countries.hk": "Honkongas",
    "countries.hn": "Hondūras",
    "countries.hr": "Kroatija",
    "countries.ht": "Haitis",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Gvatemala",
    "countries.gy": "Gajāna",
+    "countries.hk": "Honkonga",
    "countries.hn": "Hondurasa",
    "countries.hr": "Horvātija",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "ഗ്രെനാഡ",
    "countries.gt": "ഗ്വാട്ടിമാല",
    "countries.gy": "ഗയാന",
+    "countries.hk": "ഹോങ്കോങ്",
    "countries.hn": "ഹോണ്ടുറാസ്",
    "countries.hr": "ക്രോയേഷ്യ",
    "countries.ht": "ഹെയ്തി",
@@ -100,6 +100,7 @@
    "countries.gd": "ग्रेनाडा",
    "countries.gt": "ग्वाटेमाला",
    "countries.gy": "गुयाना",
+    "countries.hk": "हाँगकांग",
    "countries.hn": "होंडुरास",
    "countries.hr": "क्रोएशिया",
    "countries.ht": "हैती",
@@ -100,6 +100,7 @@
    "countries.gd": "Granada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Kroatia",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Kroatia",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "ग्रेनेडा",
    "countries.gt": "ग्वाटेमाला",
    "countries.gy": "गुयाना",
+    "countries.hk": "हाँगकाँग",
    "countries.hn": "होन्डुरस",
    "countries.hr": "क्रोएशिया",
    "countries.ht": "हैती",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hongkong",
    "countries.hn": "Honduras",
    "countries.hr": "Croatië",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Kroatia",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "ଗ୍ରେନାଡା",
    "countries.gt": "ଗୁଆଟେମାଲା",
    "countries.gy": "ଗୁଇନ୍ଦା",
+    "countries.hk": "ହଂ କଙ୍ଗ",
    "countries.hn": "ହୋଣ୍ଡୁରାସ୍",
    "countries.hr": "କ୍ରୋଏସିଆ",
    "countries.ht": "ହାଇତି",
@@ -100,6 +100,7 @@
    "countries.gd": "ਗ੍ਰੇਨਾਡਾ",
    "countries.gt": "ਗੁਆਟੇਮਾਲਾ",
    "countries.gy": "ਗੇਆਨਾ",
+    "countries.hk": "ਹਾਂਗ ਕਾਂਗ",
    "countries.hn": "ਹੌਂਡੂਰਸ",
    "countries.hr": "ਕਰੋਸ਼ੀਆ",
    "countries.ht": "ਹੈਤੀ",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Gwatemala",
    "countries.gy": "Gujana",
+    "countries.hk": "Hongkong",
    "countries.hn": "Honduras",
    "countries.hr": "Chorwacja",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Granada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guiana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Croácia",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Granada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guiana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Croácia",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Croația",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Гренада",
    "countries.gt": "Гватемала",
    "countries.gy": "Гайана",
+    "countries.hk": "Гонконг",
    "countries.hn": "Гондурас",
    "countries.hr": "Хорватия",
    "countries.ht": "Гаити",
@@ -100,6 +100,7 @@
    "countries.gd": "ग्रेनेडा",
    "countries.gt": "ग्वाटेमाला",
    "countries.gy": "गुयाना",
+    "countries.hk": "हांगकांग",
    "countries.hn": "होंडुरस्‌",
    "countries.hr": "क्रोएशिया",
    "countries.ht": "हैती",
@@ -100,6 +100,7 @@
    "countries.gd": "گرينڊا",
    "countries.gt": "گٽيمالا",
    "countries.gy": "گيانا",
+    "countries.hk": "هانگ کانگ",
    "countries.hn": "هونڊرس",
    "countries.hr": "ڪوريٽيا",
    "countries.ht": "هيٽي",
@@ -100,6 +100,7 @@
    "countries.gd": "ග්‍රෙනාඩා",
    "countries.gt": "ග්වාතමාලාව",
    "countries.gy": "ගයනා",
+    "countries.hk": "හොංකොං",
    "countries.hn": "හොන්ඩුරාස්",
    "countries.hr": "ක්‍රොඒෂියාව",
    "countries.ht": "හයිටි",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hongkong",
    "countries.hn": "Honduras",
    "countries.hr": "Chorvátsko",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Gvatemala",
    "countries.gy": "Gvajana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Hrvaška",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Croatia",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guajana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Kroacia",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Kroatien",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "கிரெனடா",
    "countries.gt": "குவாத்தமாலா",
    "countries.gy": "கயானா",
+    "countries.hk": "ஹாங்காங்",
    "countries.hn": "ஹொண்டூராஸ்",
    "countries.hr": "குரோவாசியா",
    "countries.ht": "ஹைத்தி",
@@ -100,6 +100,7 @@
    "countries.gd": "గ్రెనడా",
    "countries.gt": "గ్వాటెమాల",
    "countries.gy": "గయానా",
+    "countries.hk": "హాంగ్ కొంగ",
    "countries.hn": "హోండురాస్",
    "countries.hr": "క్రొయేషియా",
    "countries.ht": "హైతీ",
@@ -100,6 +100,7 @@
    "countries.gd": "เกรเนดา",
    "countries.gt": "กัวเตมาลา",
    "countries.gy": "กายอานา",
+    "countries.hk": "ฮ่องกง",
    "countries.hn": "ฮอนดูรัส",
    "countries.hr": "โครเอเชีย",
    "countries.ht": "ไฮติ",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guwatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Kroasya",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Hırvatistan",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "Гренада",
    "countries.gt": "Гватемала",
    "countries.gy": "Гайана",
+    "countries.hk": "Гонконг",
    "countries.hn": "Гондурас",
    "countries.hr": "Хорватія",
    "countries.ht": "Гаїті",
@@ -100,6 +100,7 @@
    "countries.gd": "گریناڈا",
    "countries.gt": "گوئٹے مالا",
    "countries.gy": "گیانا",
+    "countries.hk": "ہانگ کانگ",
    "countries.hn": "ہونڈوراس",
    "countries.hr": "کروشیا",
    "countries.ht": "ہیٹی",
@@ -100,6 +100,7 @@
    "countries.gd": "Grenada",
    "countries.gt": "Guatemala",
    "countries.gy": "Guyana",
+    "countries.hk": "Hong Kong",
    "countries.hn": "Honduras",
    "countries.hr": "Croatia",
    "countries.ht": "Haiti",
@@ -100,6 +100,7 @@
    "countries.gd": "格林纳达",
    "countries.gt": "危地马拉",
    "countries.gy": "圭亚那",
+    "countries.hk": "香港",
    "countries.hn": "洪都拉斯",
    "countries.hr": "克罗地亚",
    "countries.ht": "海地",
@@ -100,6 +100,7 @@
    "countries.gd": "格瑞那達",
    "countries.gt": "瓜地馬拉",
    "countries.gy": "蓋亞那",
+    "countries.hk": "香港",
    "countries.hn": "宏都拉斯",
    "countries.hr": "克羅埃西亞",
    "countries.ht": "海地",
@@ -375,7 +375,7 @@ return [
            [
                'key' => 'dotnet',
                'name' => '.NET',
-                'version' => '0.8.2',
+                'version' => '0.8.3',
                'url' => 'https://github.com/appwrite/sdk-for-dotnet',
                'package' => 'https://www.nuget.org/packages/Appwrite',
                'enabled' => true,
@@ -0,0 +1,51 @@
+<?php
+
+use Appwrite\Functions\Specification;
+
+return [
+    Specification::S_05VCPU_512MB => [
+        'slug' => 's-05vcpu-512mb',
+        'memory' => 512,
+        'cpus' => 0.5
+    ],
+    Specification::S_1VCPU_512MB => [
+        'slug' => 's-1vcpu-512mb',
+        'memory' => 512,
+        'cpus' => 1
+    ],
+    Specification::S_1VCPU_1GB => [
+        'slug' => 's-1vcpu-1gb',
+        'memory' => 1024,
+        'cpus' => 1
+    ],
+    Specification::S_2VCPU_2GB => [
+        'slug' => 's-2vcpu-2gb',
+        'memory' => 2048,
+        'cpus' => 2
+    ],
+    Specification::S_2VCPU_4GB => [
+        'slug' => 's-2vcpu-4gb',
+        'memory' => 4096,
+        'cpus' => 2
+    ],
+    Specification::S_4VCPU_4GB => [
+        'slug' => 's-4vcpu-4gb',
+        'memory' => 4096,
+        'cpus' => 4
+    ],
+    Specification::S_4VCPU_8GB => [
+        'slug' => 's-4vcpu-8gb',
+        'memory' => 8192,
+        'cpus' => 4
+    ],
+    Specification::S_8VCPU_4GB => [
+        'slug' => 's-8vcpu-4gb',
+        'memory' => 4096,
+        'cpus' => 8
+    ],
+    Specification::S_8VCPU_8GB => [
+        'slug' => 's-8vcpu-8gb',
+        'memory' => 8192,
+        'cpus' => 8
+    ]
+];
@@ -162,13 +162,31 @@ return [
            ],
            [
                'name' => '_APP_SYSTEM_SECURITY_EMAIL_ADDRESS',
-                'description' => 'This is the email address used to issue SSL certificates for custom domains or the user agent in your webhooks payload.',
+                'description' => 'Deprecated since 1.5.1 use _APP_EMAIL_SECURITY and _APP_EMAIL_CERTIFICATES instead',
                'introduction' => '0.7.0',
                'default' => 'certs@appwrite.io',
                'required' => false,
                'question' => '',
                'filter' => ''
            ],
+            [
+                'name' => '_APP_EMAIL_SECURITY',
+                'description' => 'This is the email address used as the user agent in your webhooks payload.',
+                'introduction' => '1.5.1',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_EMAIL_CERTIFICATES',
+                'description' => 'This is the email address used to issue SSL certificates for custom domains',
+                'introduction' => '1.5.1',
+                'default' => '',
+                'required' => true,
+                'question' => '',
+                'filter' => ''
+            ],
            [
                'name' => '_APP_USAGE_STATS',
                'description' => 'This variable allows you to disable the collection and displaying of usage stats. This value is set to \'enabled\' by default, to disable the usage stats set the value to \'disabled\'. When disabled, it\'s recommended to turn off the Worker Usage container to reduce resource usage.',
@@ -290,7 +290,9 @@ App::post('/v1/account')
                $existingTarget = $dbForProject->findOne('targets', [
                    Query::equal('identifier', [$email]),
                ]);
-                $user->setAttribute('targets', [...$user->getAttribute('targets', []), $existingTarget]);
+                if($existingTarget) {
+                    $user->setAttribute('targets', $existingTarget, Document::SET_TYPE_APPEND);
+                }
            }

            $dbForProject->purgeCachedDocument('users', $user->getId());
@@ -1670,10 +1672,10 @@ App::post('/v1/account/tokens/magic-url')
    ->inject('queueForEvents')
    ->inject('queueForMails')
    ->action(function (string $userId, string $email, string $url, bool $phrase, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Locale $locale, Event $queueForEvents, Mail $queueForMails) {
-
        if (empty(System::getEnv('_APP_SMTP_HOST'))) {
            throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP disabled');
        }
+        $url = htmlentities($url);

        if ($phrase === true) {
            $phrase = Phrase::generate();
@@ -2858,6 +2860,7 @@ App::post('/v1/account/recovery')
        if (empty(System::getEnv('_APP_SMTP_HOST'))) {
            throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP Disabled');
        }
+        $url = htmlentities($url);

        $roles = Authorization::getRoles();
        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
@@ -3121,6 +3124,7 @@ App::post('/v1/account/verification')
            throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP Disabled');
        }

+        $url = htmlentities($url);
        if ($user->getAttribute('emailVerification')) {
            throw new Exception(Exception::USER_EMAIL_ALREADY_VERIFIED);
        }
@@ -3427,7 +3431,7 @@ App::post('/v1/account/verification/phone')
    });

 App::put('/v1/account/verification/phone')
-    ->desc('Create phone verification (confirmation)')
+    ->desc('Update phone verification (confirmation)')
    ->groups(['api', 'account'])
    ->label('scope', 'public')
    ->label('event', 'users.[userId].verification.[tokenId].update')
@@ -3570,7 +3574,7 @@ App::get('/v1/account/mfa/factors')
    });

 App::post('/v1/account/mfa/authenticators/:type')
-    ->desc('Add Authenticator')
+    ->desc('Create Authenticator')
    ->groups(['api', 'account'])
    ->label('event', 'users.[userId].update.mfa')
    ->label('scope', 'account')
@@ -3880,7 +3884,7 @@ App::delete('/v1/account/mfa/authenticators/:type')
    });

 App::post('/v1/account/mfa/challenge')
-    ->desc('Create 2FA Challenge')
+    ->desc('Create MFA Challenge')
    ->groups(['api', 'account', 'mfa'])
    ->label('scope', 'account')
    ->label('event', 'users.[userId].challenges.[challengeId].create')
@@ -321,7 +321,7 @@ App::get('/v1/avatars/favicon')
                ->setUserAgent(\sprintf(
                    APP_USERAGENT,
                    System::getEnv('_APP_VERSION', 'UNKNOWN'),
-                    System::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS', APP_EMAIL_SECURITY)
+                    System::getEnv('_APP_EMAIL_SECURITY', System::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS', APP_EMAIL_SECURITY))
                ))
                ->fetch($url);
        } catch (\Throwable) {
@@ -2943,17 +2943,26 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')

        $processDocument($collection, $document);

+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($document, Response::MODEL_DOCUMENT);
+
+        $relationships = \array_map(
+            fn ($document) => $document->getAttribute('key'),
+            \array_filter(
+                $collection->getAttribute('attributes', []),
+                fn ($attribute) => $attribute->getAttribute('type') === Database::VAR_RELATIONSHIP
+            )
+        );
+
        $queueForEvents
            ->setParam('databaseId', $databaseId)
            ->setParam('collectionId', $collection->getId())
            ->setParam('documentId', $document->getId())
            ->setContext('collection', $collection)
            ->setContext('database', $database)
-        ;
+            ->setPayload($response->getPayload(), sensitive: $relationships);

-        $response
-            ->setStatusCode(Response::STATUS_CODE_CREATED)
-            ->dynamic($document, Response::MODEL_DOCUMENT);
    });

 App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
@@ -3524,15 +3533,23 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:docum

        $processDocument($collection, $document);

+        $response->dynamic($document, Response::MODEL_DOCUMENT);
+
+        $relationships = \array_map(
+            fn ($document) => $document->getAttribute('key'),
+            \array_filter(
+                $collection->getAttribute('attributes', []),
+                fn ($attribute) => $attribute->getAttribute('type') === Database::VAR_RELATIONSHIP
+            )
+        );
+
        $queueForEvents
            ->setParam('databaseId', $databaseId)
            ->setParam('collectionId', $collection->getId())
            ->setParam('documentId', $document->getId())
            ->setContext('collection', $collection)
            ->setContext('database', $database)
-        ;
-
-        $response->dynamic($document, Response::MODEL_DOCUMENT);
+            ->setPayload($response->getPayload(), sensitive: $relationships);
    });

 App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:documentId')
@@ -3628,6 +3645,14 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu

        $processDocument($collection, $document);

+        $relationships = \array_map(
+            fn ($document) => $document->getAttribute('key'),
+            \array_filter(
+                $collection->getAttribute('attributes', []),
+                fn ($attribute) => $attribute->getAttribute('type') === Database::VAR_RELATIONSHIP
+            )
+        );
+
        $queueForDeletes
            ->setType(DELETE_TYPE_AUDIT)
            ->setDocument($document);
@@ -3638,7 +3663,7 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu
            ->setParam('documentId', $document->getId())
            ->setContext('collection', $collection)
            ->setContext('database', $database)
-            ->setPayload($response->output($document, Response::MODEL_DOCUMENT));
+            ->setPayload($response->output($document, Response::MODEL_DOCUMENT), sensitive: $relationships);

        $response->noContent();
    });
@@ -10,6 +10,7 @@ use Appwrite\Event\Usage;
 use Appwrite\Event\Validator\FunctionEvent;
 use Appwrite\Extend\Exception;
 use Appwrite\Extend\Exception as AppwriteException;
+use Appwrite\Functions\Validator\RuntimeSpecification;
 use Appwrite\Messaging\Adapter\Realtime;
 use Appwrite\Task\Validator\Cron;
 use Appwrite\Utopia\Database\Validator\CustomId;
@@ -160,6 +161,12 @@ App::post('/v1/functions')
    ->param('templateOwner', '', new Text(128, 0), 'The name of the owner of the template.', true)
    ->param('templateRootDirectory', '', new Text(128, 0), 'Path to function code in the template repo.', true)
    ->param('templateBranch', '', new Text(128, 0), 'Production branch for the repo linked to the function template.', true)
+    ->param('specification', APP_FUNCTION_BASE_SPECIFICATION, fn (array $plan) => new RuntimeSpecification(
+        $plan,
+        Config::getParam('runtime-specifications', []),
+        App::getEnv('_APP_FUNCTIONS_CPUS', APP_FUNCTION_BASE_SPECIFICATION_CPUS),
+        App::getEnv('_APP_FUNCTIONS_MEMORY', APP_FUNCTION_BASE_SPECIFICATION_MEMORY)
+    ), 'Runtime specification for the function and builds.', true, ['plan'])
    ->inject('request')
    ->inject('response')
    ->inject('dbForProject')
@@ -169,7 +176,7 @@ App::post('/v1/functions')
    ->inject('queueForBuilds')
    ->inject('dbForConsole')
    ->inject('gitHub')
-    ->action(function (string $functionId, string $name, string $runtime, array $execute, array $events, string $schedule, int $timeout, bool $enabled, bool $logging, string $entrypoint, string $commands, string $installationId, string $providerRepositoryId, string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, string $templateRepository, string $templateOwner, string $templateRootDirectory, string $templateBranch, Request $request, Response $response, Database $dbForProject, Document $project, Document $user, Event $queueForEvents, Build $queueForBuilds, Database $dbForConsole, GitHub $github) use ($redeployVcs) {
+    ->action(function (string $functionId, string $name, string $runtime, array $execute, array $events, string $schedule, int $timeout, bool $enabled, bool $logging, string $entrypoint, string $commands, string $installationId, string $providerRepositoryId, string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, string $templateRepository, string $templateOwner, string $templateRootDirectory, string $templateBranch, string $specification, Request $request, Response $response, Database $dbForProject, Document $project, Document $user, Event $queueForEvents, Build $queueForBuilds, Database $dbForConsole, GitHub $github) use ($redeployVcs) {
        $functionId = ($functionId == 'unique()') ? ID::unique() : $functionId;

        $allowList = \array_filter(\explode(',', System::getEnv('_APP_FUNCTIONS_RUNTIMES', '')));
@@ -229,6 +236,7 @@ App::post('/v1/functions')
            'providerBranch' => $providerBranch,
            'providerRootDirectory' => $providerRootDirectory,
            'providerSilentMode' => $providerSilentMode,
+            'specification' => $specification
        ]));

        $schedule = Authorization::skip(
@@ -442,6 +450,41 @@ App::get('/v1/functions/runtimes')
        ]), Response::MODEL_RUNTIME_LIST);
    });

+App::get('/v1/functions/specifications')
+    ->groups(['api', 'functions'])
+    ->desc('Get available function runtime specifications')
+    ->label('scope', 'functions.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'functions')
+    ->label('sdk.method', 'getSpecifications')
+    ->label('sdk.description', '/docs/references/functions/get-specifications.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_SPECIFICATION_LIST)
+    ->inject('response')
+    ->inject('plan')
+    ->action(function (Response $response, array $plan) {
+        $allRuntimeSpecs = Config::getParam('runtime-specifications', []);
+
+        $runtimeSpecs = [];
+        foreach ($allRuntimeSpecs as $spec) {
+            $spec['enabled'] = true;
+
+            if (array_key_exists('runtimeSpecifications', $plan)) {
+                $spec['enabled'] = in_array($spec['slug'], $plan['runtimeSpecifications']);
+            }
+
+            // Only add specs that are within the limits set by environment variables
+            if ($spec['cpus'] <= System::getEnv('_APP_FUNCTIONS_CPUS', 1) && $spec['memory'] <= System::getEnv('_APP_FUNCTIONS_MEMORY', 512)) {
+                $runtimeSpecs[] = $spec;
+            }
+        }
+
+        $response->dynamic(new Document([
+            'specifications' => $runtimeSpecs,
+        ]), Response::MODEL_SPECIFICATION_LIST);
+    });
+
 App::get('/v1/functions/:functionId')
    ->groups(['api', 'functions'])
    ->desc('Get function')
@@ -499,6 +542,8 @@ App::get('/v1/functions/:functionId/usage')
            str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_COMPUTE),
            str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS),
            str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE),
+            str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_MB_SECONDS),
+            str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS)
        ];

        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats) {
@@ -561,6 +606,10 @@ App::get('/v1/functions/:functionId/usage')
            'buildsTime' => $usage[$metrics[4]]['data'],
            'executions' => $usage[$metrics[5]]['data'],
            'executionsTime' => $usage[$metrics[6]]['data'],
+            'buildsMbSecondsTotal' => $usage[$metrics[7]]['total'],
+            'buildsMbSeconds' => $usage[$metrics[7]]['data'],
+            'executionsMbSeconds' => $usage[$metrics[8]]['data'],
+            'executionsMbSecondsTotal' => $usage[$metrics[8]]['total']
        ]), Response::MODEL_USAGE_FUNCTION);
    });

@@ -591,6 +640,8 @@ App::get('/v1/functions/usage')
            METRIC_BUILDS_COMPUTE,
            METRIC_EXECUTIONS,
            METRIC_EXECUTIONS_COMPUTE,
+            METRIC_BUILDS_MB_SECONDS,
+            METRIC_EXECUTIONS_MB_SECONDS,
        ];

        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats) {
@@ -654,6 +705,10 @@ App::get('/v1/functions/usage')
            'buildsTime' => $usage[$metrics[5]]['data'],
            'executions' => $usage[$metrics[6]]['data'],
            'executionsTime' => $usage[$metrics[7]]['data'],
+            'buildsMbSecondsTotal' => $usage[$metrics[8]]['total'],
+            'buildsMbSeconds' => $usage[$metrics[8]]['data'],
+            'executionsMbSeconds' => $usage[$metrics[9]]['data'],
+            'executionsMbSecondsTotal' => $usage[$metrics[9]]['total'],
        ]), Response::MODEL_USAGE_FUNCTIONS);
    });

@@ -687,6 +742,12 @@ App::put('/v1/functions/:functionId')
    ->param('providerBranch', '', new Text(128, 0), 'Production branch for the repo linked to the function', true)
    ->param('providerSilentMode', false, new Boolean(), 'Is the VCS (Version Control System) connection in silent mode for the repo linked to the function? In silent mode, comments will not be made on commits and pull requests.', true)
    ->param('providerRootDirectory', '', new Text(128, 0), 'Path to function code in the linked repo.', true)
+    ->param('specification', APP_FUNCTION_BASE_SPECIFICATION, fn (array $plan) => new RuntimeSpecification(
+        $plan,
+        Config::getParam('runtime-specifications', []),
+        App::getEnv('_APP_FUNCTIONS_CPUS', APP_FUNCTION_BASE_SPECIFICATION_CPUS),
+        App::getEnv('_APP_FUNCTIONS_MEMORY', APP_FUNCTION_BASE_SPECIFICATION_MEMORY)
+    ), 'Runtime specification for the function and builds.', true, ['plan'])
    ->inject('request')
    ->inject('response')
    ->inject('dbForProject')
@@ -695,9 +756,8 @@ App::put('/v1/functions/:functionId')
    ->inject('queueForBuilds')
    ->inject('dbForConsole')
    ->inject('gitHub')
-    ->action(function (string $functionId, string $name, string $runtime, array $execute, array $events, string $schedule, int $timeout, bool $enabled, bool $logging, string $entrypoint, string $commands, string $installationId, string $providerRepositoryId, string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, Request $request, Response $response, Database $dbForProject, Document $project, Event $queueForEvents, Build $queueForBuilds, Database $dbForConsole, GitHub $github) use ($redeployVcs) {
+    ->action(function (string $functionId, string $name, string $runtime, array $execute, array $events, string $schedule, int $timeout, bool $enabled, bool $logging, string $entrypoint, string $commands, string $installationId, string $providerRepositoryId, string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, string $specification, Request $request, Response $response, Database $dbForProject, Document $project, Event $queueForEvents, Build $queueForBuilds, Database $dbForConsole, GitHub $github) use ($redeployVcs) {
        // TODO: If only branch changes, re-deploy
-
        $function = $dbForProject->getDocument('functions', $functionId);

        if ($function->isEmpty()) {
@@ -795,6 +855,21 @@ App::put('/v1/functions/:functionId')
            $live = false;
        }

+        $spec = Config::getParam('runtime-specifications')[$specification] ?? [];
+
+        // Enforce Cold Start if spec limits change.
+        if ($function->getAttribute('specification') !== $specification && !empty($function->getAttribute('deployment'))) {
+            $executor = new Executor(App::getEnv('_APP_EXECUTOR_HOST'));
+            try {
+                $executor->deleteRuntime($project->getId(), $function->getAttribute('deployment'));
+            } catch (\Throwable $th) {
+                // Don't throw if the deployment doesn't exist
+                if ($th->getCode() !== 404) {
+                    throw $th;
+                }
+            }
+        }
+
        $function = $dbForProject->updateDocument('functions', $function->getId(), new Document(array_merge($function->getArrayCopy(), [
            'execute' => $execute,
            'name' => $name,
@@ -815,6 +890,7 @@ App::put('/v1/functions/:functionId')
            'providerBranch' => $providerBranch,
            'providerRootDirectory' => $providerRootDirectory,
            'providerSilentMode' => $providerSilentMode,
+            'specification' => $specification,
            'search' => implode(' ', [$functionId, $name, $runtime]),
        ])));

@@ -838,7 +914,7 @@ App::put('/v1/functions/:functionId')

 App::get('/v1/functions/:functionId/deployments/:deploymentId/download')
    ->groups(['api', 'functions'])
-    ->desc('Download Deployment')
+    ->desc('Download deployment')
    ->label('scope', 'functions.read')
    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
    ->label('sdk.namespace', 'functions')
@@ -923,7 +999,7 @@ App::get('/v1/functions/:functionId/deployments/:deploymentId/download')

 App::patch('/v1/functions/:functionId/deployments/:deploymentId')
    ->groups(['api', 'functions'])
-    ->desc('Update function deployment')
+    ->desc('Update deployment')
    ->label('scope', 'functions.write')
    ->label('event', 'functions.[functionId].deployments.[deploymentId].update')
    ->label('audits.event', 'deployment.update')
@@ -1536,6 +1612,7 @@ App::post('/v1/functions/:functionId/executions')

        $version = $function->getAttribute('version', 'v2');
        $runtimes = Config::getParam($version === 'v2' ? 'runtimes-v2' : 'runtimes', []);
+        $spec = Config::getParam('runtime-specifications')[$function->getAttribute('specification', APP_FUNCTION_BASE_SPECIFICATION)];

        $runtime = (isset($runtimes[$function->getAttribute('runtime', '')])) ? $runtimes[$function->getAttribute('runtime', '')] : null;

@@ -1702,6 +1779,8 @@ App::post('/v1/functions/:functionId/executions')
            'APPWRITE_FUNCTION_PROJECT_ID' => $project->getId(),
            'APPWRITE_FUNCTION_RUNTIME_NAME' => $runtime['name'] ?? '',
            'APPWRITE_FUNCTION_RUNTIME_VERSION' => $runtime['version'] ?? '',
+            'APPWRITE_FUNCTION_CPUS' => $spec['cpus'] ?? APP_FUNCTION_BASE_SPECIFICATION_CPUS,
+            'APPWRITE_FUNCTION_MEMORY' => $spec['memory'] ?? APP_FUNCTION_BASE_SPECIFICATION_MEMORY
        ]);

        /** Execute function */
@@ -1724,6 +1803,8 @@ App::post('/v1/functions/:functionId/executions')
                method: $method,
                headers: $headers,
                runtimeEntrypoint: $command,
+                cpus: $spec['cpus'] ?? APP_FUNCTION_BASE_SPECIFICATION_CPUS,
+                memory: $spec['memory'] ?? APP_FUNCTION_BASE_SPECIFICATION_MEMORY,
                requestTimeout: 30
            );

@@ -1761,6 +1842,8 @@ App::post('/v1/functions/:functionId/executions')
                ->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_BASE_SPECIFICATION_MEMORY) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_FUNCTION_BASE_SPECIFICATION_CPUS)))
+                ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS), (int)(($spec['memory'] ?? APP_FUNCTION_BASE_SPECIFICATION_MEMORY) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_FUNCTION_BASE_SPECIFICATION_CPUS)))
            ;

            if ($function->getAttribute('logging')) {
--- a/Show More
+++ b/Show More