Skip to content

Commit a7dc299

Browse files
mpartipilompartipilo
authored
Merge pull request #126 from weaviate/chore/more-fixes
2 parents 3b6f9f3 + d7515b2 commit a7dc299

File tree

13 files changed

+503
-446
lines changed

13 files changed

+503
-446
lines changed

‎src/Example/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ static async Task Main()
154154
Console.WriteLine("Querying Neighboring Cats: [20,21,22]");
155155

156156
var queryNearVector = await collection.Query.NearVector(
157-
vector: VectorData.Create(20f, 21f, 22f),
157+
vector: new[] { 20f, 21f, 22f },
158158
distance: 0.5f,
159159
limit: 5,
160160
returnProperties: ["name", "breed", "color", "counter"],

‎src/Weaviate.Client.Tests/Integration/TestCollectionAggregate.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,23 +278,23 @@ int expectedLen
278278
if (option.ContainsKey("objectLimit"))
279279
{
280280
result = await collectionClient.Aggregate.NearVector(
281-
nearVector.ToVectorData(),
281+
nearVector,
282282
metrics: metrics,
283283
limit: Convert.ToUInt32(option["objectLimit"])
284284
);
285285
}
286286
else if (option.ContainsKey("certainty"))
287287
{
288288
result = await collectionClient.Aggregate.NearVector(
289-
nearVector.ToVectorData(),
289+
nearVector,
290290
metrics: metrics,
291291
certainty: Convert.ToDouble(option["certainty"])
292292
);
293293
}
294294
else if (option.ContainsKey("distance"))
295295
{
296296
result = await collectionClient.Aggregate.NearVector(
297-
nearVector.ToVectorData(),
297+
nearVector,
298298
metrics: metrics,
299299
distance: Convert.ToDouble(option["distance"])
300300
);

‎src/Weaviate.Client.Tests/Integration/TestFilters.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public async Task Filtering()
1515
var uuid_A2 = await cA.Data.Insert(new() { Name = "A2", Size = 5 });
1616

1717
// Act
18-
var list = await cA.Query.FetchObjects(filter: Filter.Property("name").Equal("A1"));
18+
var list = await cA.Query.FetchObjects(filters: Filter.Property("name").Equal("A1"));
1919

2020
var objs = list.Objects.ToList();
2121

@@ -48,7 +48,7 @@ public async Task FilteringWithMetadataDates()
4848
Assert.Equal(DateTimeKind.Utc, objA1.Metadata.CreationTime.Value.Kind);
4949

5050
var filter = Filter.CreationTime.Equal(objA1.Metadata.CreationTime.Value);
51-
var list = await cA.Query.FetchObjects(filter: filter);
51+
var list = await cA.Query.FetchObjects(filters: filter);
5252

5353
Assert.NotEmpty(list);
5454

@@ -69,7 +69,7 @@ public async Task FilteringWithExpressions()
6969

7070
// Act
7171
var list = await cA.Query.FetchObjects(
72-
filter: Filter<TestData>.Property(x => x.Size).GreaterThan(3)
72+
filters: Filter<TestData>.Property(x => x.Size).GreaterThan(3)
7373
);
7474

7575
var objs = list.ToList();
@@ -125,7 +125,7 @@ await cFrom.Data.Insert(new { Name = "second" }, references: [("ref", uuidsTo[1]
125125
uuidsFrom.AddRange([third, fourth]);
126126

127127
// Act
128-
var objects = await cFrom.Query.FetchObjects(filter: filter);
128+
var objects = await cFrom.Query.FetchObjects(filters: filter);
129129

130130
var objs = objects.ToList();
131131

@@ -149,7 +149,7 @@ await c.Data.Insert(new { Name = "first" }, _reusableUuids[0]),
149149
await c.Data.Insert(new { Name = "second" }, _reusableUuids[1]),
150150
};
151151

152-
var objects = (await c.Query.FetchObjects(filter: filter)).ToList();
152+
var objects = (await c.Query.FetchObjects(filters: filter)).ToList();
153153

154154
Assert.Single(objects);
155155
Assert.Equal(_reusableUuids[0], objects[0].ID);
@@ -182,7 +182,7 @@ await collection.Data.Insert(
182182
};
183183

184184
// Act
185-
var objects = await collection.Query.FetchObjects(filter: filter);
185+
var objects = await collection.Query.FetchObjects(filters: filter);
186186
var objs = objects.ToList();
187187

188188
// Assert
@@ -217,7 +217,7 @@ public async Task FilterByNestedReferenceCount()
217217

218218
// Act
219219
var objects = await two.Query.FetchObjects(
220-
filter: Filter.Reference("ref2").Reference("ref1").Count.Equal(1),
220+
filters: Filter.Reference("ref2").Reference("ref1").Count.Equal(1),
221221
returnReferences:
222222
[
223223
new QueryReference("ref2", [], references: [new QueryReference("ref1", [])]),
@@ -258,7 +258,7 @@ public async Task TimeFilterContains()
258258

259259
// Act
260260
var objects = await collection.Query.FetchObjects(
261-
filter: Filter.CreationTime.ContainsAny(
261+
filters: Filter.CreationTime.ContainsAny(
262262
[obj2!.Metadata.CreationTime!.Value, obj3!.Metadata.CreationTime!.Value]
263263
)
264264
);
@@ -299,7 +299,7 @@ public async Task TimeFiltering(string key)
299299
var weaviateFilter = filterFunc(referenceTime);
300300

301301
// Act
302-
var objects = await collection.Query.FetchObjects(filter: weaviateFilter);
302+
var objects = await collection.Query.FetchObjects(filters: weaviateFilter);
303303
var objs = objects.ToList();
304304

305305
// Assert
@@ -357,7 +357,7 @@ await collection.Data.Insert(
357357
};
358358

359359
// Act
360-
var objects = await collection.Query.FetchObjects(filter: filter);
360+
var objects = await collection.Query.FetchObjects(filters: filter);
361361

362362
// Assert
363363
Assert.Equal(results.Length, objects.Count());
@@ -465,7 +465,7 @@ await collection.Data.Insert(
465465
};
466466

467467
// Act
468-
var objects = await collection.Query.FetchObjects(filter: filter);
468+
var objects = await collection.Query.FetchObjects(filters: filter);
469469

470470
// Assert
471471
Assert.Equal(results.Length, objects.Count());

‎src/Weaviate.Client.Tests/Integration/TestMultiVector.cs‎

Lines changed: 43 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,14 @@ public async Task Test_MultiVector_SelfProvided()
140140
new Vectors()
141141
{
142142
{ "regular", new[] { 1f, 2f } },
143-
{ "colbert", new[] { new[] { 1f, 2f }, new[] { 4f, 5f } } },
143+
{
144+
"colbert",
145+
new[,]
146+
{
147+
{ 1f, 2f },
148+
{ 4f, 5f },
149+
}
150+
},
144151
}
145152
);
146153
});
@@ -150,13 +157,19 @@ public async Task Test_MultiVector_SelfProvided()
150157
Assert.Equal(1UL, await collection.Count());
151158

152159
var objs = await collection.Query.NearVector(
153-
VectorData.Create(1f, 2f),
160+
Vectors.Create(1f, 2f),
154161
targetVector: ["regular"]
155162
);
156163
Assert.Single(objs);
157164

158165
objs = await collection.Query.NearVector(
159-
VectorData.Create(new[] { 1f, 2f }, new[] { 3f, 4f }),
166+
Vectors.Create(
167+
new[,]
168+
{
169+
{ 1f, 2f },
170+
{ 3f, 4f },
171+
}
172+
),
160173
targetVector: ["colbert"]
161174
);
162175
Assert.Single(objs);
@@ -169,36 +182,57 @@ public async Task Test_MultiVector_SelfProvided()
169182
// Assert.Single(objs);
170183

171184
objs = await collection.Query.NearVector(
172-
VectorData.Create("colbert", new[] { new[] { 1f, 2f }, new[] { 3f, 4f } }),
185+
Vectors.Create(
186+
"colbert",
187+
new[,]
188+
{
189+
{ 1f, 2f },
190+
{ 3f, 4f },
191+
}
192+
),
173193
targetVector: ["colbert"]
174194
);
175195
Assert.Single(objs);
176196

177197
objs = await collection.Query.Hybrid(
178198
query: null,
179-
vectors: VectorData.Create("default", new[] { 1f, 2f }),
199+
vectors: Vector.Create(1f, 2f),
180200
targetVector: ["regular"]
181201
);
182202
Assert.Single(objs);
183203

184204
objs = await collection.Query.Hybrid(
185205
query: null,
186-
vectors: VectorData.Create("default", new[] { new[] { 1f, 2f }, new[] { 3f, 4f } }),
206+
vectors: Vectors.Create(
207+
"default",
208+
new[,]
209+
{
210+
{ 1f, 2f },
211+
{ 3f, 4f },
212+
}
213+
),
187214
targetVector: ["colbert"]
188215
);
189216
Assert.Single(objs);
190217

191218
objs = await collection.Query.Hybrid(
192219
query: null,
193-
vectors: VectorData.Create("colbert", new[] { new[] { 1f, 2f }, new[] { 3f, 4f } }),
220+
vectors: Vectors.Create(
221+
"colbert",
222+
new[,]
223+
{
224+
{ 1f, 2f },
225+
{ 3f, 4f },
226+
}
227+
),
194228
targetVector: ["colbert"]
195229
);
196230
Assert.Single(objs);
197231

198-
// Vector Lists not supported
232+
// Vector Lists not supported (yet, but coming soon)
199233
// objs = await collection.Query.Hybrid(
200234
// query: null,
201-
// vector: VectorData.Create("colbert", new[] { new[] { 1f, 2f }, new[] { 3f, 4f } }),
235+
// vector: Vectors.Create("colbert", new[] { new[] { 1f, 2f }, new[] { 3f, 4f } }),
202236
// targetVector: "colbert"
203237
// );
204238
// Assert.Single(objs);

‎src/Weaviate.Client.Tests/Integration/TestNearVector.cs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,25 @@ public async Task NearVectorSearch()
1616
// Act
1717
await collectionClient.Data.Insert(
1818
new TestData { Name = "TestObject1" },
19-
vectors: new Vectors { { "default", 0.1f, 0.2f, 0.3f } }
19+
vectors: new[] { 0.1f, 0.2f, 0.3f }
2020
);
2121

2222
await collectionClient.Data.Insert(
2323
new TestData { Name = "TestObject2" },
24-
vectors: new Vectors { { "default", 0.3f, 0.4f, 0.5f } }
24+
vectors: new[] { 0.3f, 0.4f, 0.5f }
2525
);
2626

2727
await collectionClient.Data.Insert(
2828
data: new TestData { Name = "TestObject3" },
29-
vectors: new Vectors { { "default", 0.5f, 0.6f, 0.7f } }
29+
vectors: new[] { 0.5f, 0.6f, 0.7f }
3030
);
3131

3232
var objs = await collectionClient.Query.FetchObjects(
3333
returnMetadata: MetadataOptions.Vector
3434
);
3535

3636
// Assert
37-
var retrieved = await collectionClient.Query.NearVector(
38-
VectorData.Create(0.1f, 0.2f, 0.3f)
39-
);
37+
var retrieved = await collectionClient.Query.NearVector(new[] { 0.1f, 0.2f, 0.3f });
4038
Assert.NotNull(retrieved);
4139
Assert.NotEmpty(retrieved.Objects);
4240

‎src/Weaviate.Client.Tests/Integration/TestSearchHybrid.cs‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ await collection.Query.Hybrid(
3636
alpha: 1,
3737
query: "name",
3838
fusionType: fusionType,
39-
vectors: VectorData.Create(objs.First().Vectors["default"])
39+
vectors: objs.First().Vectors["default"]
4040
)
4141
).Objects;
4242

@@ -100,7 +100,7 @@ public async Task Test_SearchHybridOnlyVector(string? query)
100100
var objs = await collection.Query.Hybrid(
101101
alpha: 1,
102102
query: query,
103-
vectors: VectorData.Create(obj.Vectors["default"])
103+
vectors: obj.Vectors["default"]
104104
);
105105

106106
Assert.Equal(2, objs.Count());
@@ -195,7 +195,7 @@ public async Task Test_Hybrid_Near_Vector_Search()
195195
var hybridObjs = (
196196
await collection.Query.Hybrid(
197197
query: null,
198-
vectors: new HybridNearVector((VectorData<float>)obj.Vectors["default"])
198+
vectors: new HybridNearVector(obj.Vectors["default"])
199199
)
200200
).Objects;
201201

@@ -204,7 +204,7 @@ await collection.Query.Hybrid(
204204

205205
var nearVec = (
206206
await collection.Query.NearVector(
207-
vector: VectorData.Create("default", obj.Vectors["default"]),
207+
vector: obj.Vectors["default"],
208208
returnMetadata: MetadataOptions.Distance
209209
)
210210
).Objects;
@@ -214,7 +214,7 @@ await collection.Query.NearVector(
214214
var hybridObjs2 = await collection.Query.Hybrid(
215215
query: null,
216216
vectors: new HybridNearVector(
217-
(VectorData<float>)obj.Vectors["default"],
217+
obj.Vectors["default"],
218218
Distance: Convert.ToSingle(nearVec.First().Metadata.Distance!.Value + 0.001)
219219
),
220220
returnMetadata: MetadataOptions.All
@@ -251,7 +251,7 @@ public async Task Test_Hybrid_Near_Vector_Search_Named_Vectors()
251251
var hybridObjs = (
252252
await collection.Query.Hybrid(
253253
query: null,
254-
vectors: new HybridNearVector(VectorData.Create("text", obj.Vectors["text"])),
254+
vectors: new HybridNearVector(obj.Vectors["text"]),
255255
targetVector: ["text"]
256256
)
257257
).Objects;
@@ -261,7 +261,7 @@ await collection.Query.Hybrid(
261261

262262
var nearVec = (
263263
await collection.Query.NearVector(
264-
vector: VectorData.Create("text", obj.Vectors["text"]),
264+
vector: obj.Vectors["text"],
265265
targetVector: ["text"],
266266
returnMetadata: MetadataOptions.Distance
267267
)
@@ -273,7 +273,7 @@ await collection.Query.NearVector(
273273
await collection.Query.Hybrid(
274274
query: null,
275275
vectors: new HybridNearVector(
276-
VectorData.Create("text", obj.Vectors["text"]),
276+
obj.Vectors["text"],
277277
Distance: Convert.ToSingle(nearVec.First().Metadata.Distance!.Value + 0.001)
278278
),
279279
targetVector: ["text"],
@@ -387,15 +387,15 @@ public async Task Test_Vector_Per_Target()
387387

388388
var uuid1 = await collection.Data.Insert(
389389
new { },
390-
vectors: new Dictionary<string, float[]>
390+
vectors: new Vectors
391391
{
392392
{ "first", new float[] { 1, 0 } },
393393
{ "second", new float[] { 1, 0, 0 } },
394394
}
395395
);
396396
var uuid2 = await collection.Data.Insert(
397397
new { },
398-
vectors: new Dictionary<string, float[]>
398+
vectors: new Vectors
399399
{
400400
{ "first", new float[] { 0, 1 } },
401401
{ "second", new float[] { 0, 0, 1 } },
@@ -553,19 +553,15 @@ public async Task Test_Vector_Distance()
553553
await collection.Data.Insert(new { }, vectors: new float[] { 0, 0, 1 });
554554

555555
var objs = (
556-
await collection.Query.Hybrid(
557-
"name",
558-
vectors: VectorData.Create("default", 1f, 0f, 0f),
559-
alpha: 0.7f
560-
)
556+
await collection.Query.Hybrid("name", vectors: Vector.Create(1f, 0f, 0f), alpha: 0.7f)
561557
).ToList();
562558
Assert.Equal(3, objs.Count);
563559
Assert.Equal(uuid1, objs[0].ID);
564560

565561
objs = (
566562
await collection.Query.Hybrid(
567563
"name",
568-
vectors: VectorData.Create("default", 1f, 0f, 0f),
564+
vectors: Vectors.Create(1f, 0f, 0f),
569565
maxVectorDistance: 0.1f,
570566
alpha: 0.7f
571567
)

0 commit comments

Comments
 (0)