Rebase

Author: mpartipilo

src/Weaviate.Client/gRPC/Search.Builders.cs

@@ -375,64 +375,76 @@ private static (
 
         vector ??= new Models.Vectors();
 
-        if (targetVector is null && vector.Count > 0)
+        targetVector ??= vector.Keys.Where(tv => string.IsNullOrEmpty(tv) is false).ToArray();
+
+        targets = targetVector;
+
+        if (targetVector.Count() == 1 && vector.Count == 1)
         {
-            targetVector = vector.Keys.Where(tv => string.IsNullOrEmpty(tv) is false).ToArray();
+            // If only one target vector is specified, use Vectors
+            // This also covers the case where no target vector is specified and only one vector is provided
+            // In this case, we assume the single provided vector is the target
+            vectors = vector
+                .Select(v => new V1.Vectors
+                {
+                    Name = v.Key,
+                    Type = v.Value.IsMultiVector
+                        ? V1.Vectors.Types.VectorType.MultiFp32
+                        : V1.Vectors.Types.VectorType.SingleFp32,
+                    VectorBytes = v.Value.ToByteString(),
+                })
+                .ToList();
+            return (targets, vectorForTarget, vectors);
         }
 
-        if (targetVector is not null && targetVector.Count() > 0)
+        if (
+            targetVector.Count() > 1
+            && vector.Count == targetVector.Count()
+            && targetVector.All(tv => vector.ContainsKey(tv)) // TODO Throw an exception if the TargetVector does not match the provided vectors?
+        )
         {
-            targets = targetVector;
-
-            if (
-                targetVector.Count() > 1
-                && vector.Count == targetVector.Count()
-                && targetVector.All(tv => vector.ContainsKey(tv)) // TODO Throw an exception if the TargetVector does not match the provided vectors?
-            )
-            {
-                // If multiple target vectors are specified, use VectorForTargets
-                vectorForTarget = targetVector
-                    .Select(
-                        (v, idx) =>
-                            new
-                            {
-                                Name = v,
-                                Index = idx,
-                                Vector = vector.ContainsKey(v)
-                                    ? vector[v]
-                                    : vector.Values.ElementAt(idx),
-                            }
-                    )
-                    .Select(v => new VectorForTarget()
+            // If multiple target vectors are specified, use VectorForTargets
+            vectorForTarget = targetVector
+                .Select(
+                    (v, idx) =>
+                        new
+                        {
+                            Name = v,
+                            Index = idx,
+                            Vector = vector.ContainsKey(v)
+                                ? vector[v]
+                                : vector.Values.ElementAt(idx),
+                        }
+                )
+                .Select(v => new VectorForTarget()
+                {
+                    Name = v.Name,
+                    Vectors =
                     {
-                        Name = v.Name,
-                        Vectors =
+                        new V1.Vectors
                         {
-                            new V1.Vectors
-                            {
-                                Name = v.Name,
-                                Type = v.Vector.IsMultiVector
-                                    ? V1.Vectors.Types.VectorType.MultiFp32
-                                    : V1.Vectors.Types.VectorType.SingleFp32,
-                                VectorBytes = v.Vector.ToByteString(),
-                            },
+                            Name = v.Name,
+                            Type = v.Vector.IsMultiVector
+                                ? V1.Vectors.Types.VectorType.MultiFp32
+                                : V1.Vectors.Types.VectorType.SingleFp32,
+                            VectorBytes = v.Vector.ToByteString(),
                         },
-                    })
-                    .ToList();
-            }
-            else
-            {
-                vectors = vector
-                    .Select(v => new V1.Vectors
-                    {
-                        Name = v.Key,
-                        Type = v.Value.IsMultiVector
-                            ? V1.Vectors.Types.VectorType.MultiFp32
-                            : V1.Vectors.Types.VectorType.SingleFp32,
-                        VectorBytes = v.Value.ToByteString(),
-                    })
-                    .ToList();
-            }
+                    },
+                })
+                .ToList();
+        }
+        else
+        {
+            vectors = vector
+                .Select(v => new V1.Vectors
+                {
+                    Name = v.Key,
+                    Type = v.Value.IsMultiVector
+                        ? V1.Vectors.Types.VectorType.MultiFp32
+                        : V1.Vectors.Types.VectorType.SingleFp32,
+                    VectorBytes = v.Value.ToByteString(),
+                })
+                .ToList();
         }
 
         return (targets, vectorForTarget, vectors);
@@ -566,9 +578,23 @@ private static void BuildHybrid(
 
         if (vector is not null && nearText is null && nearVector is null)
         {
-            var (targets, _, vectors) = BuildTargetVector(targetVector, vector);
-            request.HybridSearch.Vectors.AddRange(vectors);
-            request.HybridSearch.Targets = targets;
+            var (targets, vfts, vectors) = BuildTargetVector(targetVector, vector);
+
+            if (vfts is not null)
+            {
+                nearVector = new HybridNearVector(
+                    vector,
+                    Certainty: null,
+                    Distance: null,
+                    targetVector: targetVector
+                );
+                vector = null; // Clear vector to avoid duplication
+            }
+            else if (vectors is not null)
+            {
+                request.HybridSearch.Vectors.Add(vectors);
+                request.HybridSearch.Targets = targets;
+            }
         }
 
         if (vector is null && nearText is not null && nearVector is null)
@@ -581,6 +607,7 @@ private static void BuildHybrid(
                 nearText.MoveAway,
                 targetVector
             );
+
             request.HybridSearch.Targets = request.HybridSearch.NearText.Targets;
         }