Make changes to fix reported bugs and to close the following issues:

- #325
- #328
- #345
- #346
- #349
- #350
- #350

Author: tsmith023

src/collections/config/integration.test.ts

@@ -8,6 +8,7 @@ import {
   ModuleConfig,
   MultiTenancyConfig,
   PropertyConfig,
+  RQConfig,
   RerankerCohereConfig,
   VectorIndexConfigDynamic,
   VectorIndexConfigHNSW,
@@ -877,4 +878,25 @@ describe('Testing of the collection.config namespace', () => {
         );
     });
   });
+
+  requireAtLeast(1, 32, 0).it(
+    'should be able to create a collection with RQ quantizer bits option',
+    async () => {
+      const collectionName = 'TestCollectionRQQuantizerBits';
+      const collection = await client.collections.create({
+        name: collectionName,
+        vectorizers: weaviate.configure.vectors.selfProvided({
+          quantizer: weaviate.configure.vectorIndex.quantizer.rq({ bits: 1, rescoreLimit: 10 }),
+        }),
+      });
+      await collection.config.get().then((config) => {
+        console.log(JSON.stringify(config, null, 2));
+        const indexConfig = config.vectorizers.default.indexConfig as VectorIndexConfigHNSW;
+        expect(indexConfig.quantizer).toBeDefined();
+        expect(indexConfig.quantizer?.type).toEqual('rq');
+        expect((indexConfig.quantizer as RQConfig).bits).toEqual(1);
+        expect((indexConfig.quantizer as RQConfig).rescoreLimit).toEqual(10);
+      });
+    }
+  );
 });

src/collections/config/types/generative.ts

@@ -12,6 +12,7 @@ export type GenerativeAWSConfig = {
   service: string;
   model?: string;
   endpoint?: string;
+  maxTokens?: number;
 };
 
 export type GenerativeAnthropicConfig = {

src/collections/config/types/vectorizer.ts

@@ -40,10 +40,12 @@ export type Vectorizer =
   | 'text2vec-nvidia'
   | 'text2vec-mistral'
   | 'text2vec-model2vec'
+  | 'text2vec-morph'
   | 'text2vec-ollama'
   | 'text2vec-openai'
   | Text2VecPalmVectorizer
   | 'text2vec-google'
+  | 'text2vec-google-ai-studio'
   | 'text2vec-transformers'
   | 'text2vec-voyageai'
   | 'text2vec-weaviate'
@@ -93,6 +95,30 @@ export type Multi2VecNvidiaConfig = {
   };
 };
 
+/** The configuration for multi-media vectorization using the AWS module.
+ *
+ * See the [documentation](https://weaviate.io/developers/weaviate/model-providers/aws/embeddings-multimodal) for detailed usage.
+ */
+export type Multi2VecAWSConfig = {
+  /** The dimensionality of the vector once embedded. */
+  dimensions?: number;
+  /** The model to use. */
+  model?: string;
+  /** The AWS region where the model runs. */
+  region?: string;
+  /** The image fields used when vectorizing. */
+  imageFields?: string[];
+  /** The text fields used when vectorizing. */
+  textFields?: string[];
+  /** The weights of the fields used for vectorization. */
+  weights?: {
+    /** The weights of the image fields. */
+    imageFields?: number[];
+    /** The weights of the text fields. */
+    textFields?: number[];
+  };
+};
+
 /** The configuration for multi-media vectorization using the CLIP module.
  *
  * See the [documentation](https://weaviate.io/developers/weaviate/model-providers/transformers/embeddings-multimodal) for detailed usage.
@@ -504,6 +530,8 @@ export type Text2VecPalmConfig = Text2VecGoogleConfig;
 export type Text2VecGoogleConfig = {
   /** The API endpoint to use without a leading scheme such as `http://`. */
   apiEndpoint?: string;
+  /** The dimensionality of the vector once embedded. */
+  dimensions?: number;
   /** The model ID to use. */
   model?: string;
   /** The model ID to use.
@@ -517,6 +545,13 @@ export type Text2VecGoogleConfig = {
   vectorizeCollectionName?: boolean;
 };
 
+export type Text2VecGoogleAiStudioConfig = {
+  /** The model ID to use. */
+  model?: string;
+  /** The Weaviate property name for the `gecko-002` or `gecko-003` model to use as the title. */
+  titleProperty?: string;
+};
+
 /**
  * The configuration for text vectorization using the Transformers module.
  *
@@ -579,10 +614,18 @@ export type Text2VecModel2Vec = {
   vectorizeCollectionName?: boolean;
 };
 
+export type Text2VecMorphConfig = {
+  /** The base URL to use where API requests should go. */
+  baseURL?: string;
+  /** The model to use. */
+  model?: string;
+};
+
 export type NoVectorizerConfig = {};
 
 export type VectorizerConfig =
   | Img2VecNeuralConfig
+  | Multi2VecAWSConfig
   | Multi2VecClipConfig
   | Multi2VecBindConfig
   | Multi2VecGoogleConfig
@@ -652,6 +695,8 @@ export type VectorizerConfigType<V> = V extends 'img2vec-neural'
   ? Text2VecMistralConfig | undefined
   : V extends 'text2vec-model2vec'
   ? Text2VecModel2Vec | undefined
+  : V extends 'text2vec-morph'
+  ? Text2VecMorphConfig | undefined
   : V extends 'text2vec-ollama'
   ? Text2VecOllamaConfig | undefined
   : V extends 'text2vec-openai'

src/collections/configure/types/vectorizer.ts

@@ -1,7 +1,16 @@
 import {
   Img2VecNeuralConfig,
   ModuleConfig,
+  Multi2MultivecJinaAIConfig,
+  Multi2VecAWSConfig,
+  Multi2VecBindConfig,
+  Multi2VecClipConfig,
+  Multi2VecCohereConfig,
   Multi2VecField,
+  Multi2VecGoogleConfig,
+  Multi2VecJinaAIConfig,
+  Multi2VecNvidiaConfig,
+  Multi2VecVoyageAIConfig,
   Ref2VecCentroidConfig,
   Text2MultiVecJinaAIConfig,
   Text2VecAWSConfig,
@@ -10,11 +19,13 @@ import {
   Text2VecContextionaryConfig,
   Text2VecDatabricksConfig,
   Text2VecGPT4AllConfig,
+  Text2VecGoogleAiStudioConfig,
   Text2VecGoogleConfig,
   Text2VecHuggingFaceConfig,
   Text2VecJinaAIConfig,
   Text2VecMistralConfig,
   Text2VecModel2Vec,
+  Text2VecMorphConfig,
   Text2VecNvidiaConfig,
   Text2VecOllamaConfig,
   Text2VecOpenAIConfig,
@@ -128,36 +139,43 @@ export type Img2VecNeuralConfigCreate = Img2VecNeuralConfig;
 // image_fields: The image fields to use in vectorization.
 // text_fields: The text fields to use in vectorization.
 
+type Multi2VecOmissions =
+  | 'audioFields'
+  | 'depthFields'
+  | 'imageFields'
+  | 'IMUFields'
+  | 'thermalFields'
+  | 'textFields'
+  | 'videoFields'
+  | 'weights';
+
 /** The configuration for the `multi2vec-nvidia` vectorizer. */
-export type Multi2VecNvidiaConfigCreate = {
-  /** The model to use. Defaults to `None`, which uses the server-defined default. */
-  model?: string;
-  /** The base URL where API requests should go. */
-  baseURL?: string;
-  /** Whether to apply truncation. */
-  truncation?: boolean;
+export type Multi2VecNvidiaConfigCreate = Omit<Multi2VecNvidiaConfig, Multi2VecOmissions> & {
+  /** The image fields to use in vectorization. Can be string of `Multi2VecField` type. If string, weight 0 will be assumed. */
+  imageFields?: string[] | Multi2VecField[];
   /** Format in which the embeddings are encoded. Defaults to `None`, so the embeddings are represented as a list of floating-point numbers. */
   outputEncoding?: string;
+  /** The text fields to use in vectorization. Can be string of `Multi2VecField` type. If string, weight 0 will be assumed. */
+  textFields?: string[] | Multi2VecField[];
+};
+
+export type Multi2VecAWSConfigCreate = Omit<Multi2VecAWSConfig, Multi2VecOmissions> & {
   /** The image fields to use in vectorization. Can be string of `Multi2VecField` type. If string, weight 0 will be assumed. */
   imageFields?: string[] | Multi2VecField[];
   /** The text fields to use in vectorization. Can be string of `Multi2VecField` type. If string, weight 0 will be assumed. */
   textFields?: string[] | Multi2VecField[];
 };
 
 /** The configuration for the `multi2vec-clip` vectorizer. */
-export type Multi2VecClipConfigCreate = {
+export type Multi2VecClipConfigCreate = Omit<Multi2VecClipConfig, Multi2VecOmissions> & {
   /** The image fields to use in vectorization. Can be string of `Multi2VecField` type. If string, weight 0 will be assumed. */
   imageFields?: string[] | Multi2VecField[];
-  /** The inference url to use where API requests should go. */
-  inferenceUrl?: string;
   /** The text fields to use in vectorization. Can be string of `Multi2VecField` type. If string, weight 0 will be assumed. */
   textFields?: string[] | Multi2VecField[];
-  /** Whether to vectorize the collection name. */
-  vectorizeCollectionName?: boolean;
 };
 
 /** The configuration for the `multi2vec-bind` vectorizer. */
-export type Multi2VecBindConfigCreate = {
+export type Multi2VecBindConfigCreate = Omit<Multi2VecBindConfig, Multi2VecOmissions> & {
   /** The audio fields to use in vectorization. Can be string of `Multi2VecField` type. If string, weight 0 will be assumed. */
   audioFields?: string[] | Multi2VecField[];
   /** The depth fields to use in vectorization. Can be string of `Multi2VecField` type. If string, weight 0 will be assumed. */
@@ -172,84 +190,43 @@ export type Multi2VecBindConfigCreate = {
   thermalFields?: string[] | Multi2VecField[];
   /** The video fields to use in vectorization. Can be string of `Multi2VecField` type. If string, weight 0 will be assumed. */
   videoFields?: string[] | Multi2VecField[];
-  /** Whether to vectorize the collection name. */
-  vectorizeCollectionName?: boolean;
 };
 
 /** The configuration for the `multi2vec-cohere` vectorizer. */
-export type Multi2VecCohereConfigCreate = {
-  /** The base URL to use where API requests should go. */
-  baseURL?: string;
+export type Multi2VecCohereConfigCreate = Omit<Multi2VecCohereConfig, Multi2VecOmissions> & {
   /** The image fields to use in vectorization. Can be string of `Multi2VecField` type. If string, weight 0 will be assumed. */
   imageFields?: string[] | Multi2VecField[];
-  /** The specific model to use. */
-  model?: string;
   /** The text fields to use in vectorization. Can be string of `Multi2VecField` type. If string, weight 0 will be assumed. */
   textFields?: string[] | Multi2VecField[];
-  /** The truncation strategy to use. */
-  truncate?: string;
-  /** Whether to vectorize the collection name. */
-  vectorizeCollectionName?: boolean;
 };
 
-export type Multi2MultivecJinaAIConfigCreate = {
-  /** The image fields to use in vectorization. */
-  imageFields?: string[];
-  /** The text fields to use in vectorization. */
-  textFields?: string[];
-};
+export type Multi2MultivecJinaAIConfigCreate = Multi2MultivecJinaAIConfig;
 
-export type Multi2VecJinaAIConfigCreate = {
-  /** The base URL to use where API requests should go. */
-  baseURL?: string;
-  /** The dimensionality of the vector once embedded. */
-  dimensions?: number;
-  /** The model to use. */
-  model?: string;
+export type Multi2VecJinaAIConfigCreate = Omit<Multi2VecJinaAIConfig, Multi2VecOmissions> & {
   /** The image fields to use in vectorization. Can be string of `Multi2VecField` type. If string, weight 0 will be assumed. */
   imageFields?: string[] | Multi2VecField[];
   /** The text fields to use in vectorization. Can be string of `Multi2VecField` type. If string, weight 0 will be assumed. */
   textFields?: string[] | Multi2VecField[];
-  /** Whether to vectorize the collection name. */
-  vectorizeCollectionName?: boolean;
 };
 
 /** @deprecated Use `Multi2VecGoogleConfigCreate` instead.*/
 export type Multi2VecPalmConfigCreate = Multi2VecGoogleConfigCreate;
 
 /** The configuration for the `multi2vec-google` vectorizer. */
-export type Multi2VecGoogleConfigCreate = {
-  /** The project id of the model in GCP. */
-  projectId: string;
-  /** Where the model runs */
-  location: string;
+export type Multi2VecGoogleConfigCreate = Omit<Multi2VecGoogleConfig, Multi2VecOmissions> & {
   /** The image fields to use in vectorization. Can be string of `Multi2VecField` type. If string, weight 0 will be assumed. */
   imageFields?: string[] | Multi2VecField[];
   /** The text fields to use in vectorization. Can be string of `Multi2VecField` type. If string, weight 0 will be assumed. */
   textFields?: string[] | Multi2VecField[];
   /** The video fields to use in vectorization. Can be string of `Multi2VecField` type. If string, weight 0 will be assumed. */
   videoFields?: string[] | Multi2VecField[];
-  /** The model ID to use. */
-  modelId?: string;
-  /** The dimensionality of the vector once embedded. */
-  dimensions?: number;
-  /** Whether to vectorize the collection name. */
-  vectorizeCollectionName?: boolean;
 };
 
-export type Multi2VecVoyageAIConfigCreate = {
-  /** The base URL to use where API requests should go. */
-  baseURL?: string;
+export type Multi2VecVoyageAIConfigCreate = Omit<Multi2VecVoyageAIConfig, Multi2VecOmissions> & {
   /** The image fields to use in vectorization. Can be string of `Multi2VecField` type. If string, weight 0 will be assumed. */
   imageFields?: string[] | Multi2VecField[];
-  /** The model to use. */
-  model?: string;
   /** The text fields to use in vectorization. Can be string of `Multi2VecField` type. If string, weight 0 will be assumed. */
   textFields?: string[] | Multi2VecField[];
-  /** Whether the input should be truncated to fit the context window. */
-  truncate?: boolean;
-  /** Whether to vectorize the collection name. */
-  vectorizeCollectionName?: boolean;
 };
 
 export type Ref2VecCentroidConfigCreate = Ref2VecCentroidConfig;
@@ -276,6 +253,8 @@ export type Text2VecMistralConfigCreate = Text2VecMistralConfig;
 
 export type Text2VecModel2VecConfigCreate = Text2VecModel2Vec;
 
+export type Text2VecMorphConfigCreate = Text2VecMorphConfig;
+
 export type Text2VecOllamaConfigCreate = Text2VecOllamaConfig;
 
 export type Text2VecOpenAIConfigCreate = Text2VecOpenAIConfig;
@@ -285,6 +264,8 @@ export type Text2VecPalmConfigCreate = Text2VecGoogleConfig;
 
 export type Text2VecGoogleConfigCreate = Text2VecGoogleConfig;
 
+export type Text2VecGoogleAiStudioConfigCreate = Text2VecGoogleAiStudioConfig;
+
 export type Text2VecTransformersConfigCreate = Text2VecTransformersConfig;
 
 export type Text2VecVoyageAIConfigCreate = Text2VecVoyageAIConfig;
@@ -335,6 +316,8 @@ export type VectorizerConfigCreateType<V> = V extends 'img2vec-neural'
   ? Text2VecMistralConfigCreate | undefined
   : V extends 'text2vec-model2vec'
   ? Text2VecModel2VecConfigCreate | undefined
+  : V extends 'text2vec-morph'
+  ? Text2VecMorphConfigCreate | undefined
   : V extends 'text2vec-ollama'
   ? Text2VecOllamaConfigCreate | undefined
   : V extends 'text2vec-openai'
@@ -345,6 +328,8 @@ export type VectorizerConfigCreateType<V> = V extends 'img2vec-neural'
   ? Text2VecPalmConfigCreate | undefined
   : V extends 'text2vec-google'
   ? Text2VecGoogleConfigCreate | undefined
+  : V extends 'text2vec-google-ai-studio'
+  ? Text2VecGoogleAiStudioConfigCreate | undefined
   : V extends 'text2vec-transformers'
   ? Text2VecTransformersConfigCreate | undefined
   : V extends 'text2vec-voyageai'