Merge pull request #162 from weaviate/dev/support-new-tenant-naming-convention

DevV3/Use new OFFLOAD nomenclature and updated OpenAPI schema

Author: tsmith023

src/collections/collection/index.ts

@@ -13,7 +13,7 @@ import generate, { Generate } from '../generate/index.js';
 import { Iterator } from '../iterator/index.js';
 import query, { Query } from '../query/index.js';
 import sort, { Sort } from '../sort/index.js';
-import tenants, { TenantInput, Tenants } from '../tenants/index.js';
+import tenants, { TenantBase, Tenants } from '../tenants/index.js';
 import { QueryMetadata, QueryProperty, QueryReference } from '../types/index.js';
 
 export interface Collection<T = undefined, N = string> {
@@ -78,10 +78,11 @@ export interface Collection<T = undefined, N = string> {
    *
    * This method does not send a request to Weaviate. It only returns a new collection object that is specific to the tenant you specify.
    *
-   * @param {string | TenantInput} tenant The tenant name or tenant object to use.
+   * @typedef {TenantBase} TT A type that extends TenantBase.
+   * @param {string | TT} tenant The tenant name or tenant object to use.
    * @returns {Collection<T, N>} A new collection object specific to the tenant you specified.
    */
-  withTenant: (tenant: string | TenantInput) => Collection<T, N>;
+  withTenant: <TT extends TenantBase>(tenant: string | TT) => Collection<T, N>;
 }
 
 export type IteratorOptions<T> = {
@@ -136,7 +137,7 @@ const collection = <T, N>(
       ),
     withConsistency: (consistencyLevel: ConsistencyLevel) =>
       collection<T, N>(connection, capitalizedName, dbVersionSupport, consistencyLevel, tenant),
-    withTenant: (tenant: string | TenantInput) =>
+    withTenant: <TT extends TenantBase>(tenant: string | TT) =>
       collection<T, N>(
         connection,
         capitalizedName,

src/collections/deserialize/index.ts

@@ -1,10 +1,13 @@
 import { WeaviateDeserializationError } from '../../errors.js';
+import { Tenant as TenantREST } from '../../openapi/types.js';
 import { BatchObject as BatchObjectGRPC, BatchObjectsReply } from '../../proto/v1/batch.js';
 import { BatchDeleteReply } from '../../proto/v1/batch_delete.js';
 import { ListValue, Properties as PropertiesGrpc, Value } from '../../proto/v1/properties.js';
 import { MetadataResult, PropertiesResult, SearchReply } from '../../proto/v1/search_get.js';
+import { TenantActivityStatus, TenantsGetReply } from '../../proto/v1/tenants.js';
 import { DbVersionSupport } from '../../utils/dbVersion.js';
 import { referenceFromObjects } from '../references/utils.js';
+import { Tenant } from '../tenants/index.js';
 import {
   BatchObject,
   BatchObjectsReturn,
@@ -298,4 +301,51 @@ export class Deserialize {
         : (undefined as any),
     };
   }
+
+  private static activityStatusGRPC(status: TenantActivityStatus): Tenant['activityStatus'] {
+    switch (status) {
+      case TenantActivityStatus.TENANT_ACTIVITY_STATUS_COLD:
+        return 'INACTIVE';
+      case TenantActivityStatus.TENANT_ACTIVITY_STATUS_HOT:
+        return 'ACTIVE';
+      case TenantActivityStatus.TENANT_ACTIVITY_STATUS_FROZEN:
+        return 'OFFLOADED';
+      case TenantActivityStatus.TENANT_ACTIVITY_STATUS_FREEZING:
+        return 'OFFLOADING';
+      case TenantActivityStatus.TENANT_ACTIVITY_STATUS_UNFREEZING:
+        return 'ONLOADING';
+      default:
+        throw new Error(`Unsupported tenant activity status: ${status}`);
+    }
+  }
+
+  public static activityStatusREST(status: TenantREST['activityStatus']): Tenant['activityStatus'] {
+    switch (status) {
+      case 'COLD':
+        return 'INACTIVE';
+      case 'HOT':
+        return 'ACTIVE';
+      case 'FROZEN':
+        return 'OFFLOADED';
+      case 'FREEZING':
+        return 'OFFLOADING';
+      case 'UNFREEZING':
+        return 'ONLOADING';
+      case undefined:
+        return 'ACTIVE';
+      default:
+        throw new Error(`Unsupported tenant activity status: ${status}`);
+    }
+  }
+
+  public static tenantsGet(reply: TenantsGetReply) {
+    const tenants: Record<string, Tenant> = {};
+    reply.tenants.forEach((t) => {
+      tenants[t.name] = {
+        name: t.name,
+        activityStatus: Deserialize.activityStatusGRPC(t.activityStatus),
+      };
+    });
+    return tenants;
+  }
 }

src/collections/query/integration.test.ts

@@ -909,7 +909,7 @@ describe('Testing of the collection.query methods with a multi-tenancy collectio
     expect(obj2.objects[0].uuid).toEqual(id2);
   });
 
-  it.skip('should find the objects in their tenants by nearObject', async () => {
+  it('should find the objects in their tenants by nearObject', async () => {
     const obj1 = await collection.withTenant(tenantOne).query.nearObject(id1);
     const obj2 = await collection.withTenant(tenantTwo).query.nearObject(id2);
     expect(obj1.objects.length).toEqual(1);

src/collections/serialize/index.ts

@@ -82,6 +82,7 @@ import {
 import { ReferenceGuards } from '../references/classes.js';
 import { Beacon } from '../references/index.js';
 import { uuidToBeacon } from '../references/utils.js';
+import { TenantBC, TenantCreate, TenantUpdate } from '../tenants/types.js';
 import {
   BatchObject,
   BatchObjects,
@@ -1135,4 +1136,66 @@ export class Serialize {
       return { batch: batch, mapped: objs };
     });
   };
+
+  public static tenantsCreate(tenant: TenantBC | TenantCreate): {
+    name: string;
+    activityStatus?: 'HOT' | 'COLD';
+  } {
+    let activityStatus: 'HOT' | 'COLD' | undefined;
+    switch (tenant.activityStatus) {
+      case 'ACTIVE':
+        activityStatus = 'HOT';
+        break;
+      case 'INACTIVE':
+        activityStatus = 'COLD';
+        break;
+      case 'HOT':
+      case 'COLD':
+      case undefined:
+        activityStatus = tenant.activityStatus;
+        break;
+      case 'FROZEN':
+        throw new WeaviateInvalidInputError(
+          'Invalid activity status. Please provide one of the following: ACTIVE, INACTIVE, HOT, COLD.'
+        );
+      default:
+        throw new WeaviateInvalidInputError(
+          'Invalid activity status. Please provide one of the following: ACTIVE, INACTIVE, HOT, COLD.'
+        );
+    }
+    return {
+      name: tenant.name,
+      activityStatus,
+    };
+  }
+
+  public static tenantUpdate = (
+    tenant: TenantBC | TenantUpdate
+  ): { name: string; activityStatus: 'HOT' | 'COLD' | 'FROZEN' } => {
+    let activityStatus: 'HOT' | 'COLD' | 'FROZEN';
+    switch (tenant.activityStatus) {
+      case 'ACTIVE':
+        activityStatus = 'HOT';
+        break;
+      case 'INACTIVE':
+        activityStatus = 'COLD';
+        break;
+      case 'OFFLOADED':
+        activityStatus = 'FROZEN';
+        break;
+      case 'HOT':
+      case 'COLD':
+      case 'FROZEN':
+        activityStatus = tenant.activityStatus;
+        break;
+      default:
+        throw new WeaviateInvalidInputError(
+          'Invalid activity status. Please provide one of the following: ACTIVE, INACTIVE, HOT, COLD, OFFLOADED.'
+        );
+    }
+    return {
+      name: tenant.name,
+      activityStatus,
+    };
+  };
 }