Merge branch 'main' into bugfix/model-configs-review-pt2

Author: databyjp

src/Weaviate.Client/Configure/Vectorizer.Multivector.cs

@@ -50,25 +50,39 @@ params string[] sourceProperties
             }
         }
 
-        public static VectorConfigBuilder Multi2VecJinaAI(
+        public static VectorConfigBuilder Text2MultiVecJinaAI(
+            string? model = null,
             string? baseURL = null,
             int? dimensions = null,
-            string[]? imageFields = null,
+            bool? vectorizeCollectionName = null
+        ) =>
+            new(
+                new Vectorizer.Text2MultiVecJinaAI
+                {
+                    Model = model,
+                    BaseURL = baseURL,
+                    Dimensions = dimensions,
+                    VectorizeCollectionName = vectorizeCollectionName,
+                }
+            );
+
+        public static VectorConfigBuilder Multi2MultiVecJinaAI(
+            string? baseURL = null,
             string? model = null,
+            string[]? imageFields = null,
             string[]? textFields = null,
-            bool? vectorizeCollectionName = null,
-            Vectorizer.Multi2VecJinaAIWeights? weights = null
+            Vectorizer.JinaAIWeights? weights = null,
+            bool? vectorizeCollectionName = null
         ) =>
             new(
-                new Vectorizer.Multi2VecJinaAI
+                new Vectorizer.Multi2MultiVecJinaAI
                 {
                     BaseURL = baseURL,
-                    Dimensions = dimensions,
-                    ImageFields = imageFields,
                     Model = model,
+                    ImageFields = imageFields,
                     TextFields = textFields,
-                    VectorizeCollectionName = vectorizeCollectionName,
                     Weights = weights,
+                    VectorizeCollectionName = vectorizeCollectionName,
                 }
             );
     }

src/Weaviate.Client/Configure/Vectorizer.cs

@@ -591,5 +591,27 @@ public static VectorConfigBuilder Text2VecJinaAI(
                     VectorizeCollectionName = vectorizeCollectionName,
                 }
             );
+
+        public static VectorConfigBuilder Multi2VecJinaAI(
+            string? model = null,
+            string? baseURL = null,
+            int? dimensions = null,
+            string[]? imageFields = null,
+            string[]? textFields = null,
+            Vectorizer.JinaAIWeights? weights = null,
+            bool? vectorizeCollectionName = null
+        ) =>
+            new(
+                new Vectorizer.Multi2VecJinaAI
+                {
+                    Model = model,
+                    BaseURL = baseURL,
+                    Dimensions = dimensions,
+                    ImageFields = imageFields,
+                    TextFields = textFields,
+                    Weights = weights,
+                    VectorizeCollectionName = vectorizeCollectionName,
+                }
+            );
     }
 }

src/Weaviate.Client/Models/Vectorizer.Declarations.cs

@@ -136,7 +136,7 @@ public partial record Multi2VecPalm : Multi2VecGoogle
     /// <summary>
     /// The weights configuration for JinaAI multi-media vectorization.
     /// </summary>
-    public partial record Multi2VecJinaAIWeights
+    public partial record JinaAIWeights
     {
         // Implicit constructor used
     }
@@ -153,6 +153,18 @@ public Multi2VecJinaAI()
             : base(IdentifierValue) { }
     }
 
+    /// <summary>
+    /// The configuration for multi-media multi-vector vectorization using the Jina module.
+    /// See the documentation for detailed usage.
+    /// </summary>
+    public partial record Multi2MultiVecJinaAI : VectorizerConfig
+    {
+        public const string IdentifierValue = "multi2multivec-jinaai";
+
+        public Multi2MultiVecJinaAI()
+            : base(IdentifierValue) { }
+    }
+
     /// <summary>
     /// The weights configuration for VoyageAI multi-media vectorization.
     /// </summary>
@@ -258,11 +270,15 @@ public Text2VecJinaAI()
     }
 
     /// <summary>
-    /// Deprecated. Use Text2VecJinaAIConfig instead.
+    /// The configuration for text multi-vector vectorization using the Jina module.
+    /// See the documentation for detailed usage.
     /// </summary>
-    public partial record Text2VecJinaConfig : Text2VecJinaAI
+    public partial record Text2MultiVecJinaAI : VectorizerConfig
     {
-        // Inherits constructor from Text2VecJinaAIConfig
+        public const string IdentifierValue = "text2multivec-jinaai";
+
+        public Text2MultiVecJinaAI()
+            : base(IdentifierValue) { }
     }
 
     /// <summary>

src/Weaviate.Client/Models/Vectorizer.cs

@@ -122,7 +122,7 @@ public partial record Multi2VecGoogle
         public Multi2VecGoogleWeights? Weights { get; set; } = null;
     }
 
-    public partial record Multi2VecJinaAIWeights
+    public partial record JinaAIWeights
     {
         public double[]? ImageFields { get; set; } = null;
         public double[]? TextFields { get; set; } = null;
@@ -136,7 +136,17 @@ public partial record Multi2VecJinaAI
         public string? Model { get; set; } = null;
         public string[]? TextFields { get; set; } = null;
         public bool? VectorizeCollectionName { get; set; } = null;
-        public Multi2VecJinaAIWeights? Weights { get; set; } = null;
+        public JinaAIWeights? Weights { get; set; } = null;
+    }
+
+    public partial record Multi2MultiVecJinaAI
+    {
+        public string? BaseURL { get; set; } = null;
+        public string? Model { get; set; } = null;
+        public string[]? ImageFields { get; set; } = null;
+        public string[]? TextFields { get; set; } = null;
+        public JinaAIWeights? Weights { get; set; } = null;
+        public bool? VectorizeCollectionName { get; set; } = null;
     }
 
     public partial record Multi2VecVoyageAIWeights
@@ -231,10 +241,12 @@ public partial record Text2VecJinaAI
         public bool? VectorizeCollectionName { get; set; } = null;
     }
 
-    [Obsolete("Use Text2VecJinaAIConfig instead.")]
-    public partial record Text2VecJinaConfig
+    public partial record Text2MultiVecJinaAI
     {
-        // Inherits all properties from Text2VecJinaAIConfig
+        public string? Model { get; set; } = null;
+        public string? BaseURL { get; set; } = null;
+        public int? Dimensions { get; set; } = null;
+        public bool? VectorizeCollectionName { get; set; } = null;
     }
 
     public partial record Text2VecNvidia

src/Weaviate.Client/Models/Vectorizers/Factory.cs

@@ -18,6 +18,10 @@ internal static class VectorizerConfigFactory
         { Vectorizer.Multi2VecBind.IdentifierValue, typeof(Vectorizer.Multi2VecBind) },
         { Vectorizer.Multi2VecGoogle.IdentifierValue, typeof(Vectorizer.Multi2VecGoogle) },
         { Vectorizer.Multi2VecJinaAI.IdentifierValue, typeof(Vectorizer.Multi2VecJinaAI) },
+        {
+            Vectorizer.Multi2MultiVecJinaAI.IdentifierValue,
+            typeof(Vectorizer.Multi2MultiVecJinaAI)
+        },
         { Vectorizer.Multi2VecVoyageAI.IdentifierValue, typeof(Vectorizer.Multi2VecVoyageAI) },
         { Vectorizer.Ref2VecCentroid.IdentifierValue, typeof(Vectorizer.Ref2VecCentroid) },
         { Vectorizer.Text2VecAWS.IdentifierValue, typeof(Vectorizer.Text2VecAWS) },
@@ -26,6 +30,7 @@ internal static class VectorizerConfigFactory
         { Vectorizer.Text2VecDatabricks.IdentifierValue, typeof(Vectorizer.Text2VecDatabricks) },
         { Vectorizer.Text2VecHuggingFace.IdentifierValue, typeof(Vectorizer.Text2VecHuggingFace) },
         { Vectorizer.Text2VecJinaAI.IdentifierValue, typeof(Vectorizer.Text2VecJinaAI) },
+        { Vectorizer.Text2MultiVecJinaAI.IdentifierValue, typeof(Vectorizer.Text2MultiVecJinaAI) },
         { Vectorizer.Text2VecNvidia.IdentifierValue, typeof(Vectorizer.Text2VecNvidia) },
         { Vectorizer.Text2VecMistral.IdentifierValue, typeof(Vectorizer.Text2VecMistral) },
         { Vectorizer.Text2VecModel2Vec.IdentifierValue, typeof(Vectorizer.Text2VecModel2Vec) },