mirror of
https://github.com/appwrite/appwrite.git
synced 2026-05-26 13:51:13 +00:00
updated
This commit is contained in:
@@ -26,7 +26,7 @@ class Action extends AppwriteAction
|
||||
$this->context = DATABASE_TYPE_DOCUMENTSDB;
|
||||
}
|
||||
if (\str_contains($path, '/vectorsdb')) {
|
||||
$this->context = DATABASE_TYPE_VECTORSDBS;
|
||||
$this->context = DATABASE_TYPE_VECTORSDB;
|
||||
}
|
||||
return parent::setHttpPath($path);
|
||||
}
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ abstract class Action extends DatabasesAction
|
||||
} elseif (str_contains($path, '/documentsdb/')) {
|
||||
$this->databaseType = DATABASE_TYPE_DOCUMENTSDB;
|
||||
} elseif (str_contains($path, '/vectorsdb/')) {
|
||||
$this->databaseType = DATABASE_TYPE_VECTORSDBS;
|
||||
$this->databaseType = DATABASE_TYPE_VECTORSDB;
|
||||
}
|
||||
|
||||
$contextId = '$' . $this->getCollectionsEventsContext() . 'Id';
|
||||
|
||||
@@ -63,11 +63,11 @@ class Create extends Action
|
||||
break;
|
||||
case VECTORSDB:
|
||||
$databases = Config::getParam('pools-vectorsdb', []);
|
||||
$databaseKeys = System::getEnv('_APP_DATABASE_VECTORSDBS_KEYS', '');
|
||||
$databaseOverride = System::getEnv('_APP_DATABASE_VECTORSDBS_OVERRIDE');
|
||||
$dbScheme = System::getEnv('_APP_DB_HOST_VECTORSDBS', 'postgresql');
|
||||
$sharedTables = \explode(',', System::getEnv('_APP_DATABASE_VECTORSDBS_SHARED_TABLES', ''));
|
||||
$sharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_VECTORSDBS_SHARED_TABLES_V1', ''));
|
||||
$databaseKeys = System::getEnv('_APP_DATABASE_VECTORSDB_KEYS', '');
|
||||
$databaseOverride = System::getEnv('_APP_DATABASE_VECTORSDB_OVERRIDE');
|
||||
$dbScheme = System::getEnv('_APP_DB_HOST_VECTORSDB', 'postgresql');
|
||||
$sharedTables = \explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES', ''));
|
||||
$sharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES_V1', ''));
|
||||
break;
|
||||
default:
|
||||
// legacy/tablesdb
|
||||
|
||||
@@ -169,7 +169,7 @@ class Update extends Action
|
||||
$databaseDoc = null;
|
||||
switch ($this->getDatabaseType()) {
|
||||
case DATABASE_TYPE_DOCUMENTSDB:
|
||||
case DATABASE_TYPE_VECTORSDBS:
|
||||
case DATABASE_TYPE_VECTORSDB:
|
||||
$databaseDoc = $authorization->skip(fn () => $dbForProject->findOne('databases', [
|
||||
Query::equal('$sequence', [$firstOperation['databaseInternalId']])
|
||||
]));
|
||||
|
||||
@@ -32,7 +32,7 @@ class Get extends Action
|
||||
{
|
||||
$this->databaseType = match (true) {
|
||||
str_contains($path, '/documentsdb') => DATABASE_TYPE_DOCUMENTSDB,
|
||||
str_contains($path, '/vectorsdb') => DATABASE_TYPE_VECTORSDBS,
|
||||
str_contains($path, '/vectorsdb') => DATABASE_TYPE_VECTORSDB,
|
||||
default => DATABASE_TYPE_LEGACY,
|
||||
};
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ class XList extends Action
|
||||
{
|
||||
$this->databaseType = match (true) {
|
||||
str_contains($path, '/documentsdb') => DATABASE_TYPE_DOCUMENTSDB,
|
||||
str_contains($path, '/vectorsdb') => DATABASE_TYPE_VECTORSDBS,
|
||||
str_contains($path, '/vectorsdb') => DATABASE_TYPE_VECTORSDB,
|
||||
default => DATABASE_TYPE_LEGACY,
|
||||
};
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ class Create extends CollectionAction
|
||||
|
||||
protected function getResponseModel(): string
|
||||
{
|
||||
return UtopiaResponse::MODEL_VECTORSDBS_COLLECTION;
|
||||
return UtopiaResponse::MODEL_VECTORSDB_COLLECTION;
|
||||
}
|
||||
|
||||
public function __construct()
|
||||
|
||||
@@ -20,7 +20,7 @@ class Delete extends CollectionDelete
|
||||
|
||||
protected function getResponseModel(): string
|
||||
{
|
||||
return UtopiaResponse::MODEL_VECTORSDBS_COLLECTION;
|
||||
return UtopiaResponse::MODEL_VECTORSDB_COLLECTION;
|
||||
}
|
||||
|
||||
public function __construct()
|
||||
|
||||
@@ -20,7 +20,7 @@ class Get extends CollectionGet
|
||||
|
||||
protected function getResponseModel(): string
|
||||
{
|
||||
return UtopiaResponse::MODEL_VECTORSDBS_COLLECTION;
|
||||
return UtopiaResponse::MODEL_VECTORSDB_COLLECTION;
|
||||
}
|
||||
|
||||
public function __construct()
|
||||
|
||||
@@ -29,7 +29,7 @@ class Update extends CollectionAction
|
||||
|
||||
protected function getResponseModel(): string
|
||||
{
|
||||
return UtopiaResponse::MODEL_VECTORSDBS_COLLECTION;
|
||||
return UtopiaResponse::MODEL_VECTORSDB_COLLECTION;
|
||||
}
|
||||
|
||||
public function __construct()
|
||||
@@ -53,7 +53,7 @@ class Update extends CollectionAction
|
||||
responses: [
|
||||
new SDKResponse(
|
||||
code: SwooleResponse::STATUS_CODE_OK,
|
||||
model: UtopiaResponse::MODEL_VECTORSDBS_COLLECTION,
|
||||
model: UtopiaResponse::MODEL_VECTORSDB_COLLECTION,
|
||||
)
|
||||
],
|
||||
contentType: ContentType::JSON
|
||||
|
||||
@@ -26,7 +26,7 @@ class Get extends CollectionUsageGet
|
||||
|
||||
protected function getMetric(): string
|
||||
{
|
||||
return METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS_VECTORSDBS;
|
||||
return METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS_VECTORSDB;
|
||||
}
|
||||
|
||||
public function __construct()
|
||||
|
||||
@@ -23,7 +23,7 @@ class XList extends CollectionXList
|
||||
|
||||
protected function getResponseModel(): string
|
||||
{
|
||||
return UtopiaResponse::MODEL_VECTORSDBS_COLLECTION_LIST;
|
||||
return UtopiaResponse::MODEL_VECTORSDB_COLLECTION_LIST;
|
||||
}
|
||||
|
||||
public function __construct()
|
||||
|
||||
@@ -21,7 +21,7 @@ class Get extends DatabaseUsageGet
|
||||
|
||||
public function getResponseModel(): string
|
||||
{
|
||||
return UtopiaResponse::MODEL_USAGE_VECTORSDBS;
|
||||
return UtopiaResponse::MODEL_USAGE_VECTORSDB;
|
||||
}
|
||||
|
||||
public function __construct()
|
||||
@@ -43,7 +43,7 @@ class Get extends DatabaseUsageGet
|
||||
responses: [
|
||||
new SDKResponse(
|
||||
code: SwooleResponse::STATUS_CODE_OK,
|
||||
model: UtopiaResponse::MODEL_USAGE_VECTORSDBS,
|
||||
model: UtopiaResponse::MODEL_USAGE_VECTORSDB,
|
||||
)
|
||||
],
|
||||
contentType: ContentType::JSON,
|
||||
|
||||
@@ -20,7 +20,7 @@ class XList extends DatabaseUsageXList
|
||||
|
||||
public function getResponseModel(): string
|
||||
{
|
||||
return UtopiaResponse::MODEL_USAGE_VECTORSDBSS;
|
||||
return UtopiaResponse::MODEL_USAGE_VECTORSDBS;
|
||||
}
|
||||
|
||||
public function __construct()
|
||||
@@ -42,7 +42,7 @@ class XList extends DatabaseUsageXList
|
||||
responses: [
|
||||
new SDKResponse(
|
||||
code: SwooleResponse::STATUS_CODE_OK,
|
||||
model: UtopiaResponse::MODEL_USAGE_VECTORSDBSS,
|
||||
model: UtopiaResponse::MODEL_USAGE_VECTORSDBS,
|
||||
)
|
||||
],
|
||||
contentType: ContentType::JSON
|
||||
|
||||
@@ -565,7 +565,7 @@ class Deletes extends Action
|
||||
'database' => $document->getAttribute('database')
|
||||
]),
|
||||
...$dbForProject->find('databases', [
|
||||
Query::equal('type', [DATABASE_TYPE_DOCUMENTSDB, DATABASE_TYPE_VECTORSDBS]),
|
||||
Query::equal('type', [DATABASE_TYPE_DOCUMENTSDB, DATABASE_TYPE_VECTORSDB]),
|
||||
Query::limit(5000),
|
||||
]),
|
||||
];
|
||||
|
||||
@@ -323,8 +323,8 @@ class Migrations extends Action
|
||||
METRIC_DATABASES_OPERATIONS_WRITES,
|
||||
METRIC_DATABASES_OPERATIONS_READS_DOCUMENTSDB,
|
||||
METRIC_DATABASES_OPERATIONS_WRITES_DOCUMENTSDB,
|
||||
METRIC_DATABASES_OPERATIONS_READS_VECTORSDBS,
|
||||
METRIC_DATABASES_OPERATIONS_WRITES_VECTORSDBS,
|
||||
METRIC_DATABASES_OPERATIONS_READS_VECTORSDB,
|
||||
METRIC_DATABASES_OPERATIONS_WRITES_VECTORSDB,
|
||||
METRIC_NETWORK_REQUESTS,
|
||||
METRIC_NETWORK_INBOUND,
|
||||
METRIC_NETWORK_OUTBOUND,
|
||||
|
||||
@@ -112,7 +112,7 @@ class StatsResources extends Action
|
||||
|
||||
$databases = $dbForProject->count('databases', [Query::equal('type', [DATABASE_TYPE_LEGACY, DATABASE_TYPE_TABLESDB])]);
|
||||
$documentsdb = $dbForProject->count('databases', [Query::equal('type', [DATABASE_TYPE_DOCUMENTSDB])]);
|
||||
$vectorsdb = $dbForProject->count('databases', [Query::equal('type', [DATABASE_TYPE_VECTORSDBS])]);
|
||||
$vectorsdb = $dbForProject->count('databases', [Query::equal('type', [DATABASE_TYPE_VECTORSDB])]);
|
||||
$buckets = $dbForProject->count('buckets');
|
||||
$users = $dbForProject->count('users');
|
||||
|
||||
@@ -148,7 +148,7 @@ class StatsResources extends Action
|
||||
$metrics = [
|
||||
METRIC_DATABASES => $databases,
|
||||
METRIC_DATABASES_DOCUMENTSDB => $documentsdb,
|
||||
METRIC_DATABASES_VECTORSDBS => $vectorsdb,
|
||||
METRIC_DATABASES_VECTORSDB => $vectorsdb,
|
||||
METRIC_BUCKETS => $buckets,
|
||||
METRIC_USERS => $users,
|
||||
METRIC_FUNCTIONS => $functions,
|
||||
@@ -282,7 +282,7 @@ class StatsResources extends Action
|
||||
$totalDocumentsDocumentsdb += $documents;
|
||||
$totalCollectionsDocumentsdb += $collections;
|
||||
break;
|
||||
case DATABASE_TYPE_VECTORSDBS:
|
||||
case DATABASE_TYPE_VECTORSDB:
|
||||
$totalDatabaseStorageVectordb += $storage;
|
||||
$totalDocumentsVectordb += $documents;
|
||||
$totalCollectionsVectordb += $collections;
|
||||
@@ -302,9 +302,9 @@ class StatsResources extends Action
|
||||
$this->createStatsDocuments($region, METRIC_DOCUMENTS_DOCUMENTSDB, $totalDocumentsDocumentsdb);
|
||||
$this->createStatsDocuments($region, METRIC_DATABASES_STORAGE_DOCUMENTSDB, $totalDatabaseStorageDocumentsdb);
|
||||
|
||||
$this->createStatsDocuments($region, METRIC_COLLECTIONS_VECTORSDBS, $totalCollectionsVectordb);
|
||||
$this->createStatsDocuments($region, METRIC_DOCUMENTS_VECTORSDBS, $totalDocumentsVectordb);
|
||||
$this->createStatsDocuments($region, METRIC_DATABASES_STORAGE_VECTORSDBS, $totalDatabaseStorageVectordb);
|
||||
$this->createStatsDocuments($region, METRIC_COLLECTIONS_VECTORSDB, $totalCollectionsVectordb);
|
||||
$this->createStatsDocuments($region, METRIC_DOCUMENTS_VECTORSDB, $totalDocumentsVectordb);
|
||||
$this->createStatsDocuments($region, METRIC_DATABASES_STORAGE_VECTORSDB, $totalDatabaseStorageVectordb);
|
||||
}
|
||||
protected function countForCollections(Database $dbForProject, Database $dbForDatabases, Document $database, string $region): array
|
||||
{
|
||||
|
||||
@@ -48,7 +48,7 @@ class StatsUsage extends Action
|
||||
protected array $skipBaseMetrics = [
|
||||
METRIC_DATABASES => true,
|
||||
METRIC_DATABASES_DOCUMENTSDB => true,
|
||||
METRIC_DATABASES_VECTORSDBS => true,
|
||||
METRIC_DATABASES_VECTORSDB => true,
|
||||
METRIC_BUCKETS => true,
|
||||
METRIC_USERS => true,
|
||||
METRIC_FUNCTIONS => true,
|
||||
@@ -70,11 +70,11 @@ class StatsUsage extends Action
|
||||
METRIC_DOCUMENTS => true,
|
||||
METRIC_COLLECTIONS_DOCUMENTSDB => true,
|
||||
METRIC_DOCUMENTS_DOCUMENTSDB => true,
|
||||
METRIC_COLLECTIONS_VECTORSDBS => true,
|
||||
METRIC_DOCUMENTS_VECTORSDBS => true,
|
||||
METRIC_COLLECTIONS_VECTORSDB => true,
|
||||
METRIC_DOCUMENTS_VECTORSDB => true,
|
||||
METRIC_DATABASES_STORAGE => true,
|
||||
METRIC_DATABASES_STORAGE_DOCUMENTSDB => true,
|
||||
METRIC_DATABASES_STORAGE_VECTORSDBS => true,
|
||||
METRIC_DATABASES_STORAGE_VECTORSDB => true,
|
||||
];
|
||||
|
||||
/**
|
||||
|
||||
@@ -34,8 +34,8 @@ class Response extends SwooleResponse
|
||||
public const MODEL_USAGE_DATABASE = 'usageDatabase';
|
||||
public const MODEL_USAGE_DOCUMENTSDBS = 'usageDocumentsDBs';
|
||||
public const MODEL_USAGE_DOCUMENTSDB = 'usageDocumentsDB';
|
||||
public const MODEL_USAGE_VECTORSDBSS = 'usageVectorsDBs';
|
||||
public const MODEL_USAGE_VECTORSDBS = 'usageVectorsDB';
|
||||
public const MODEL_USAGE_VECTORSDBS = 'usageVectorsDBs';
|
||||
public const MODEL_USAGE_VECTORSDB = 'usageVectorsDB';
|
||||
public const MODEL_USAGE_TABLE = 'usageTable';
|
||||
public const MODEL_USAGE_COLLECTION = 'usageCollection';
|
||||
public const MODEL_USAGE_USERS = 'usageUsers';
|
||||
@@ -52,8 +52,8 @@ class Response extends SwooleResponse
|
||||
public const MODEL_DATABASE_LIST = 'databaseList';
|
||||
public const MODEL_COLLECTION = 'collection';
|
||||
public const MODEL_COLLECTION_LIST = 'collectionList';
|
||||
public const MODEL_VECTORSDBS_COLLECTION = 'vectorsdbCollection';
|
||||
public const MODEL_VECTORSDBS_COLLECTION_LIST = 'vectorsdbCollectionList';
|
||||
public const MODEL_VECTORSDB_COLLECTION = 'vectorsdbCollection';
|
||||
public const MODEL_VECTORSDB_COLLECTION_LIST = 'vectorsdbCollectionList';
|
||||
public const MODEL_EMBEDDING = 'embedding';
|
||||
public const MODEL_EMBEDDING_LIST = 'embeddingList';
|
||||
public const MODEL_TABLE = 'table';
|
||||
|
||||
@@ -91,6 +91,6 @@ class UsageVectorsDB extends Model
|
||||
|
||||
public function getType(): string
|
||||
{
|
||||
return Response::MODEL_USAGE_VECTORSDBS;
|
||||
return Response::MODEL_USAGE_VECTORSDB;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -104,6 +104,6 @@ class UsageVectorsDBs extends Model
|
||||
|
||||
public function getType(): string
|
||||
{
|
||||
return Response::MODEL_USAGE_VECTORSDBSS;
|
||||
return Response::MODEL_USAGE_VECTORSDB;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,6 +36,6 @@ class VectorsDBCollection extends Collection
|
||||
|
||||
public function getType(): string
|
||||
{
|
||||
return Response::MODEL_VECTORSDBS_COLLECTION;
|
||||
return Response::MODEL_VECTORSDB_COLLECTION;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user