Add missing functionality to update multi tenancy config

Author: tsmith023

src/collections/config/classes.ts

@@ -3,13 +3,15 @@ import { WeaviateInvalidInputError } from '../../errors.js';
 import {
   WeaviateClass,
   WeaviateInvertedIndexConfig,
+  WeaviateMultiTenancyConfig,
   WeaviateReplicationConfig,
   WeaviateVectorIndexConfig,
   WeaviateVectorsConfig,
 } from '../../openapi/types.js';
 import { QuantizerGuards } from '../configure/parsing.js';
 import {
   InvertedIndexConfigUpdate,
+  MultiTenancyConfigUpdate,
   ReplicationConfigUpdate,
   VectorConfigUpdate,
   VectorIndexConfigFlatUpdate,
@@ -67,6 +69,15 @@ export class MergeWithExisting {
     return merged;
   }
 
+  static multiTenancy(
+    current: WeaviateMultiTenancyConfig,
+    update?: MultiTenancyConfigUpdate
+  ): MultiTenancyConfigUpdate {
+    if (current === undefined) throw Error('Multi-tenancy config is missing from the class schema.');
+    if (update === undefined) return current;
+    return { ...current, ...update };
+  }
+
   static replication(
     current: WeaviateReplicationConfig,
     update?: ReplicationConfigUpdate

src/collections/config/types/index.ts

@@ -5,6 +5,7 @@ export * from './vectorizer.js';
 
 import {
   InvertedIndexConfigUpdate,
+  MultiTenancyConfigUpdate,
   ReplicationConfigUpdate,
   VectorConfigUpdate,
 } from '../../configure/types/index.js';
@@ -103,6 +104,7 @@ export type CollectionConfig = {
 export type CollectionConfigUpdate = {
   description?: string;
   invertedIndex?: InvertedIndexConfigUpdate;
+  multiTenancy?: MultiTenancyConfigUpdate;
   replication?: ReplicationConfigUpdate;
   vectorizers?:
     | VectorConfigUpdate<undefined, VectorIndexType>

src/collections/config/unit.test.ts

@@ -1,4 +1,8 @@
-import { WeaviateInvertedIndexConfig, WeaviateVectorsConfig } from '../../openapi/types';
+import {
+  WeaviateInvertedIndexConfig,
+  WeaviateMultiTenancyConfig,
+  WeaviateVectorsConfig,
+} from '../../openapi/types';
 import { MergeWithExisting } from './classes';
 
 describe('Unit testing of the MergeWithExisting class', () => {
@@ -112,6 +116,12 @@ describe('Unit testing of the MergeWithExisting class', () => {
     },
   };
 
+  const multiTenancyConfig: WeaviateMultiTenancyConfig = {
+    enabled: false,
+    autoTenantActivation: false,
+    autoTenantCreation: false,
+  };
+
   it('should merge a partial invertedIndexUpdate with existing schema', () => {
     const merged = MergeWithExisting.invertedIndex(JSON.parse(JSON.stringify(invertedIndex)), {
       bm25: {
@@ -341,4 +351,17 @@ describe('Unit testing of the MergeWithExisting class', () => {
       },
     });
   });
+
+  it('should merge full multi tenancy config with existing schema', () => {
+    const merged = MergeWithExisting.multiTenancy(JSON.parse(JSON.stringify(multiTenancyConfig)), {
+      enabled: true,
+      autoTenantActivation: true,
+      autoTenantCreation: true,
+    });
+    expect(merged).toEqual({
+      enabled: true,
+      autoTenantActivation: true,
+      autoTenantCreation: true,
+    });
+  });
 });

src/collections/configure/types/base.ts

@@ -31,6 +31,12 @@ export type InvertedIndexConfigUpdate = {
 
 export type MultiTenancyConfigCreate = RecursivePartial<MultiTenancyConfig>;
 
+export type MultiTenancyConfigUpdate = {
+  autoTenantActivation?: boolean;
+  autoTenantCreation?: boolean;
+  enabled?: boolean;
+};
+
 export type NestedPropertyCreate<T = undefined> = T extends undefined
   ? {
       name: string;