Merge branch 'main' into feat-1.5.x-readme

This commit is contained in:
Vincent (Wen Yu) Ge 2024-03-08 17:51:00 +01:00 committed by GitHub
commit 239df6a6ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
33 changed files with 234 additions and 27 deletions

2
.gitmodules vendored
View file

@ -1,4 +1,4 @@
[submodule "app/console"]
path = app/console
url = https://github.com/appwrite/console
branch = 4.0.1
branch = 4.0.2

View file

@ -203,7 +203,7 @@ return [
[
'key' => 'cli',
'name' => 'Command Line',
'version' => '4.2.0',
'version' => '5.0.0',
'url' => 'https://github.com/appwrite/sdk-for-cli',
'package' => 'https://www.npmjs.com/package/appwrite-cli',
'enabled' => true,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1 +1 @@
Subproject commit 5ac6eb5585b3294493588823a2e15bca15494669
Subproject commit 8e7eb7e337ddd1c9e14c7c93008a2b871bda70ad

View file

@ -112,7 +112,7 @@ const APP_KEY_ACCCESS = 24 * 60 * 60; // 24 hours
const APP_USER_ACCCESS = 24 * 60 * 60; // 24 hours
const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
const APP_CACHE_BUSTER = 331;
const APP_VERSION_STABLE = '1.5.0';
const APP_VERSION_STABLE = '1.5.1';
const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
const APP_DATABASE_ATTRIBUTE_IP = 'ip';

View file

@ -600,13 +600,14 @@ services:
appwrite-worker-usage:
image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
entrypoint: usage
entrypoint: worker-usage
container_name: appwrite-worker-usage
<<: *x-logging
restart: unless-stopped
networks:
- appwrite
depends_on:
- redis
- mariadb
environment:
- _APP_ENV
@ -624,6 +625,35 @@ services:
- _APP_USAGE_STATS
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
- _APP_USAGE_AGGREGATION_INTERVAL
appwrite-worker-usage-dump:
image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
entrypoint: worker-usage-dump
<<: *x-logging
container_name: appwrite-worker-usage-dump
networks:
- appwrite
depends_on:
- redis
- mariadb
environment:
- _APP_ENV
- _APP_WORKER_PER_CORE
- _APP_OPENSSL_KEY_V1
- _APP_DB_HOST
- _APP_DB_PORT
- _APP_DB_SCHEMA
- _APP_DB_USER
- _APP_DB_PASS
- _APP_REDIS_HOST
- _APP_REDIS_PORT
- _APP_REDIS_USER
- _APP_REDIS_PASS
- _APP_USAGE_STATS
- _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG
- _APP_USAGE_AGGREGATION_INTERVAL
appwrite-scheduler-functions:
image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>

12
composer.lock generated
View file

@ -2731,16 +2731,16 @@
"packages-dev": [
{
"name": "appwrite/sdk-generator",
"version": "0.37.1",
"version": "0.37.3",
"source": {
"type": "git",
"url": "https://github.com/appwrite/sdk-generator.git",
"reference": "3e6a23febcd4392c83e9be772ce545ba42bfbb3a"
"reference": "ee68012b0f99b9e3dcaea8e231cff186c7a66699"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/3e6a23febcd4392c83e9be772ce545ba42bfbb3a",
"reference": "3e6a23febcd4392c83e9be772ce545ba42bfbb3a",
"url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/ee68012b0f99b9e3dcaea8e231cff186c7a66699",
"reference": "ee68012b0f99b9e3dcaea8e231cff186c7a66699",
"shasum": ""
},
"require": {
@ -2776,9 +2776,9 @@
"description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
"support": {
"issues": "https://github.com/appwrite/sdk-generator/issues",
"source": "https://github.com/appwrite/sdk-generator/tree/0.37.1"
"source": "https://github.com/appwrite/sdk-generator/tree/0.37.3"
},
"time": "2024-03-08T09:29:12+00:00"
"time": "2024-03-08T15:39:13+00:00"
},
{
"name": "doctrine/deprecations",

View file

@ -0,0 +1,2 @@
appwrite health getQueueUsageDump \

View file

@ -0,0 +1,3 @@
appwrite projects updateApiStatusAll \
--projectId <PROJECT_ID> \
--status false

View file

@ -0,0 +1,12 @@
import 'package:dart_appwrite/dart_appwrite.dart';
Client client = Client()
.setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
.setProject('5df5acd0d48c2') // Your project ID
.setKey('919c2d18fb5d4...a2ae413da83346ad2'); // Your secret API key
Health health = Health(client);
HealthQueue result = await health.getQueueUsageDump(
threshold: 0, // (optional)
);

View file

@ -0,0 +1,12 @@
import { Client, Health } from "https://deno.land/x/appwrite/mod.ts";
const client = new Client()
.setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
.setProject('5df5acd0d48c2') // Your project ID
.setKey('919c2d18fb5d4...a2ae413da83346ad2'); // Your secret API key
const health = new Health(client);
const response = await health.getQueueUsageDump(
null // threshold (optional)
);

View file

@ -0,0 +1,14 @@
using Appwrite;
using Appwrite.Models;
using Appwrite.Services;
Client client = new Client()
.SetEndPoint("https://cloud.appwrite.io/v1") // Your API Endpoint
.SetProject("5df5acd0d48c2") // Your project ID
.SetKey("919c2d18fb5d4...a2ae413da83346ad2"); // Your secret API key
Health health = new Health(client);
HealthQueue result = await health.GetQueueUsageDump(
threshold: 0 // optional
);

View file

@ -0,0 +1,7 @@
query {
healthGetQueueUsageDump(
threshold: 0
) {
size
}
}

View file

@ -0,0 +1,23 @@
import io.appwrite.Client;
import io.appwrite.coroutines.CoroutineCallback;
import io.appwrite.services.Health;
Client client = new Client()
.setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
.setProject("5df5acd0d48c2") // Your project ID
.setKey("919c2d18fb5d4...a2ae413da83346ad2"); // Your secret API key
Health health = new Health(client);
health.getQueueUsageDump(
0, // threshold (optional)
new CoroutineCallback<>((result, error) -> {
if (error != null) {
error.printStackTrace();
return;
}
System.out.println(result);
})
);

View file

@ -0,0 +1,14 @@
import io.appwrite.Client
import io.appwrite.coroutines.CoroutineCallback
import io.appwrite.services.Health
val client = Client()
.setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
.setProject("5df5acd0d48c2") // Your project ID
.setKey("919c2d18fb5d4...a2ae413da83346ad2") // Your secret API key
val health = Health(client)
val response = health.getQueueUsageDump(
threshold = 0 // optional
)

View file

@ -0,0 +1,12 @@
const sdk = require('node-appwrite');
const client = new sdk.Client()
.setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
.setProject('5df5acd0d48c2') // Your project ID
.setKey('919c2d18fb5d4...a2ae413da83346ad2'); // Your secret API key
const health = new sdk.Health(client);
const result = await health.getQueueUsageDump(
null // threshold (optional)
);

View file

@ -0,0 +1,15 @@
<?php
use Appwrite\Client;
use Appwrite\Services\Health;
$client = (new Client())
->setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
->setProject('5df5acd0d48c2') // Your project ID
->setKey('919c2d18fb5d4...a2ae413da83346ad2'); // Your secret API key
$health = new Health($client);
$result = $health->getQueueUsageDump(
threshold: null // optional
);

View file

@ -0,0 +1,12 @@
from appwrite.client import Client
client = Client()
client.set_endpoint('https://cloud.appwrite.io/v1') # Your API Endpoint
client.set_project('5df5acd0d48c2') # Your project ID
client.set_key('919c2d18fb5d4...a2ae413da83346ad2') # Your secret API key
health = Health(client)
result = health.get_queue_usage_dump(
threshold = None # optional
)

View file

@ -0,0 +1,7 @@
GET /v1/health/queue/usage-dump HTTP/1.1
Host: cloud.appwrite.io
Content-Type: application/json
X-Appwrite-Response-Format: 1.5.0
X-Appwrite-Project: 5df5acd0d48c2
X-Appwrite-Key: 919c2d18fb5d4...a2ae413da83346ad2

View file

@ -1,4 +1,4 @@
GET /v1/health/queue/usage-dump HTTP/1.1
GET /v1/health/queue/usage HTTP/1.1
Host: cloud.appwrite.io
Content-Type: application/json
X-Appwrite-Response-Format: 1.5.0

View file

@ -0,0 +1,14 @@
require 'appwrite'
include Appwrite
client = Client.new
.set_endpoint('https://cloud.appwrite.io/v1') # Your API Endpoint
.set_project('5df5acd0d48c2') # Your project ID
.set_key('919c2d18fb5d4...a2ae413da83346ad2') # Your secret API key
health = Health.new(client)
result = health.get_queue_usage_dump(
threshold: null # optional
)

View file

@ -0,0 +1,13 @@
import Appwrite
let client = Client()
.setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
.setProject("5df5acd0d48c2") // Your project ID
.setKey("919c2d18fb5d4...a2ae413da83346ad2") // Your secret API key
let health = Health(client)
let healthQueue = try await health.getQueueUsageDump(
threshold: 0 // optional
)

View file

@ -1,3 +1,11 @@
## 11.0.0
* Added enum support
* Added SSR support
* Added messaging service support
* Added contains query support
* Added or query support
## 10.1.0
* Add new queue health endpoints

View file

@ -1,3 +1,11 @@
## 12.0.0
* Added enum support
* Added SSR support
* Added messaging service support
* Added contains query support
* Added or query support
## 11.0.1
* Fix between queries

View file

@ -79,6 +79,7 @@ abstract class Migration
'1.4.12' => 'V19',
'1.4.13' => 'V19',
'1.5.0' => 'V20',
'1.5.1' => 'V20',
];
/**

View file

@ -115,20 +115,20 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
$config->setNPMPackage('appwrite-cli');
$config->setExecutableName('appwrite');
$config->setLogo(json_encode("
_ _ _ ___ __ _____
_ _ _ ___ __ _____
/_\ _ __ _ ____ ___ __(_) |_ ___ / __\ / / \_ \
//_\\\| '_ \| '_ \ \ /\ / / '__| | __/ _ \ / / / / / /\/
/ _ \ |_) | |_) \ V V /| | | | || __/ / /___/ /___/\/ /_
\_/ \_/ .__/| .__/ \_/\_/ |_| |_|\__\___| \____/\____/\____/
|_| |_|
/ _ \ |_) | |_) \ V V /| | | | || __/ / /___/ /___/\/ /_
\_/ \_/ .__/| .__/ \_/\_/ |_| |_|\__\___| \____/\____/\____/
|_| |_|
"));
$config->setLogoUnescaped("
_ _ _ ___ __ _____
_ _ _ ___ __ _____
/_\ _ __ _ ____ ___ __(_) |_ ___ / __\ / / \_ \
//_\\\| '_ \| '_ \ \ /\ / / '__| | __/ _ \ / / / / / /\/
/ _ \ |_) | |_) \ V V /| | | | || __/ / /___/ /___/\/ /_
\_/ \_/ .__/| .__/ \_/\_/ |_| |_|\__\___| \____/\____/\____/
/ _ \ |_) | |_) \ V V /| | | | || __/ / /___/ /___/\/ /_
\_/ \_/ .__/| .__/ \_/\_/ |_| |_|\__\___| \____/\____/\____/
|_| |_| ");
break;
case 'php':