Skip to content

Commit 95cd718

Browse files
committed
Improved typing for Django tests [skip ci]
1 parent 935118b commit 95cd718

1 file changed

Lines changed: 33 additions & 33 deletions

File tree

tests/test_django.py

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ def test_vector_l1_distance(self) -> None:
211211

212212
def test_halfvec(self) -> None:
213213
Item(id=1, half_embedding=[1, 2, 3]).save()
214-
item = Item.objects.get(pk=1) # type: ignore
214+
item = Item.objects.get(pk=1)
215215
assert item.half_embedding == [1, 2, 3]
216216

217217
def test_halfvec_l2_distance(self) -> None:
@@ -244,7 +244,7 @@ def test_halfvec_l1_distance(self) -> None:
244244

245245
def test_bit(self) -> None:
246246
Item(id=1, binary_embedding='101').save()
247-
item = Item.objects.get(pk=1) # type: ignore
247+
item = Item.objects.get(pk=1)
248248
assert item.binary_embedding == '101'
249249

250250
def test_bit_hamming_distance(self) -> None:
@@ -263,7 +263,7 @@ def test_bit_jaccard_distance(self) -> None:
263263

264264
def test_sparsevec(self) -> None:
265265
Item(id=1, sparse_embedding=SparseVector([1, 2, 3])).save()
266-
item = Item.objects.get(pk=1) # type: ignore
266+
item = Item.objects.get(pk=1)
267267
assert item.sparse_embedding == SparseVector([1, 2, 3])
268268

269269
def test_sparsevec_l2_distance(self) -> None:
@@ -334,7 +334,7 @@ def test_halfvec_sum(self) -> None:
334334

335335
def test_serialization(self) -> None:
336336
create_items()
337-
items = Item.objects.all() # type: ignore
337+
items = Item.objects.all()
338338
for format in ['json', 'xml']:
339339
data = serializers.serialize(format, items)
340340
with mock.patch('django.core.serializers.python.apps.get_model') as get_model:
@@ -349,26 +349,26 @@ def test_vector_form(self) -> None:
349349

350350
def test_vector_form_instance(self) -> None:
351351
Item(id=1, embedding=[1, 2, 3]).save()
352-
item = Item.objects.get(pk=1) # type: ignore
352+
item = Item.objects.get(pk=1)
353353
form = VectorForm(instance=item)
354354
assert 'value="[1.0, 2.0, 3.0]"' in form.as_div() # type: ignore
355355

356356
def test_vector_form_save(self) -> None:
357357
Item(id=1, embedding=[1, 2, 3]).save()
358-
item = Item.objects.get(pk=1) # type: ignore
358+
item = Item.objects.get(pk=1)
359359
form = VectorForm(instance=item, data={'embedding': '[4, 5, 6]'})
360360
assert form.has_changed()
361361
assert form.is_valid()
362362
assert form.save()
363-
assert Item.objects.get(pk=1).embedding == [4, 5, 6] # type: ignore
363+
assert Item.objects.get(pk=1).embedding == [4, 5, 6]
364364

365365
def test_vector_form_save_missing(self) -> None:
366366
Item(id=1).save()
367-
item = Item.objects.get(pk=1) # type: ignore
367+
item = Item.objects.get(pk=1)
368368
form = VectorForm(instance=item, data={'embedding': ''})
369369
assert form.is_valid()
370370
assert form.save()
371-
assert Item.objects.get(pk=1).embedding is None # type: ignore
371+
assert Item.objects.get(pk=1).embedding is None
372372

373373
def test_halfvec_form(self) -> None:
374374
form = HalfVectorForm(data={'half_embedding': '[1, 2, 3]'})
@@ -377,26 +377,26 @@ def test_halfvec_form(self) -> None:
377377

378378
def test_halfvec_form_instance(self) -> None:
379379
Item(id=1, half_embedding=[1, 2, 3]).save()
380-
item = Item.objects.get(pk=1) # type: ignore
380+
item = Item.objects.get(pk=1)
381381
form = HalfVectorForm(instance=item)
382382
assert 'value="[1.0, 2.0, 3.0]"' in form.as_div() # type: ignore
383383

384384
def test_halfvec_form_save(self) -> None:
385385
Item(id=1, half_embedding=[1, 2, 3]).save()
386-
item = Item.objects.get(pk=1) # type: ignore
386+
item = Item.objects.get(pk=1)
387387
form = HalfVectorForm(instance=item, data={'half_embedding': '[4, 5, 6]'})
388388
assert form.has_changed()
389389
assert form.is_valid()
390390
assert form.save()
391-
assert Item.objects.get(pk=1).half_embedding == [4, 5, 6] # type: ignore
391+
assert Item.objects.get(pk=1).half_embedding == [4, 5, 6]
392392

393393
def test_halfvec_form_save_missing(self) -> None:
394394
Item(id=1).save()
395-
item = Item.objects.get(pk=1) # type: ignore
395+
item = Item.objects.get(pk=1)
396396
form = HalfVectorForm(instance=item, data={'half_embedding': ''})
397397
assert form.is_valid()
398398
assert form.save()
399-
assert Item.objects.get(pk=1).half_embedding is None # type: ignore
399+
assert Item.objects.get(pk=1).half_embedding is None
400400

401401
def test_bit_form(self) -> None:
402402
form = BitForm(data={'binary_embedding': '101'})
@@ -405,26 +405,26 @@ def test_bit_form(self) -> None:
405405

406406
def test_bit_form_instance(self) -> None:
407407
Item(id=1, binary_embedding='101').save()
408-
item = Item.objects.get(pk=1) # type: ignore
408+
item = Item.objects.get(pk=1)
409409
form = BitForm(instance=item)
410410
assert 'value="101"' in form.as_div() # type: ignore
411411

412412
def test_bit_form_save(self) -> None:
413413
Item(id=1, binary_embedding='101').save()
414-
item = Item.objects.get(pk=1) # type: ignore
414+
item = Item.objects.get(pk=1)
415415
form = BitForm(instance=item, data={'binary_embedding': '010'})
416416
assert form.has_changed()
417417
assert form.is_valid()
418418
assert form.save()
419-
assert '010' == Item.objects.get(pk=1).binary_embedding # type: ignore
419+
assert '010' == Item.objects.get(pk=1).binary_embedding
420420

421421
def test_bit_form_save_missing(self) -> None:
422422
Item(id=1).save()
423-
item = Item.objects.get(pk=1) # type: ignore
423+
item = Item.objects.get(pk=1)
424424
form = BitForm(instance=item, data={'binary_embedding': ''})
425425
assert form.is_valid()
426426
assert form.save()
427-
assert Item.objects.get(pk=1).binary_embedding is None # type: ignore
427+
assert Item.objects.get(pk=1).binary_embedding is None
428428

429429
def test_sparsevec_form(self) -> None:
430430
form = SparseVectorForm(data={'sparse_embedding': '{1:1,2:2,3:3}/3'})
@@ -433,41 +433,41 @@ def test_sparsevec_form(self) -> None:
433433

434434
def test_sparsevec_form_instance(self) -> None:
435435
Item(id=1, sparse_embedding=[1, 2, 3]).save()
436-
item = Item.objects.get(pk=1) # type: ignore
436+
item = Item.objects.get(pk=1)
437437
form = SparseVectorForm(instance=item)
438438
# TODO improve
439439
assert 'value="{1:1.0,2:2.0,3:3.0}/3"' in form.as_div() # type: ignore
440440

441441
def test_sparsevec_form_save(self) -> None:
442442
Item(id=1, sparse_embedding=[1, 2, 3]).save()
443-
item = Item.objects.get(pk=1) # type: ignore
443+
item = Item.objects.get(pk=1)
444444
form = SparseVectorForm(instance=item, data={'sparse_embedding': '{1:4,2:5,3:6}/3'})
445445
assert form.has_changed()
446446
assert form.is_valid()
447447
assert form.save()
448-
assert Item.objects.get(pk=1).sparse_embedding == SparseVector([4, 5, 6]) # type: ignore
448+
assert Item.objects.get(pk=1).sparse_embedding == SparseVector([4, 5, 6])
449449

450450
def test_sparesevec_form_save_missing(self) -> None:
451451
Item(id=1).save()
452-
item = Item.objects.get(pk=1) # type: ignore
452+
item = Item.objects.get(pk=1)
453453
form = SparseVectorForm(instance=item, data={'sparse_embedding': ''})
454454
assert form.is_valid()
455455
assert form.save()
456-
assert Item.objects.get(pk=1).sparse_embedding is None # type: ignore
456+
assert Item.objects.get(pk=1).sparse_embedding is None
457457

458458
def test_clean(self) -> None:
459459
item = Item(id=1, embedding=[1, 2, 3], half_embedding=[1, 2, 3], binary_embedding='101', sparse_embedding=SparseVector([1, 2, 3]))
460460
item.full_clean()
461461

462462
def test_get_or_create(self) -> None:
463-
Item.objects.get_or_create(embedding=[1, 2, 3]) # type: ignore
463+
Item.objects.get_or_create(embedding=[1, 2, 3])
464464

465465
def test_missing(self) -> None:
466466
Item().save()
467-
assert Item.objects.first().embedding is None # type: ignore
468-
assert Item.objects.first().half_embedding is None # type: ignore
469-
assert Item.objects.first().binary_embedding is None # type: ignore
470-
assert Item.objects.first().sparse_embedding is None # type: ignore
467+
assert Item.objects.first().embedding is None
468+
assert Item.objects.first().half_embedding is None
469+
assert Item.objects.first().binary_embedding is None
470+
assert Item.objects.first().sparse_embedding is None
471471

472472
def test_vector_array(self) -> None:
473473
Item(id=1, embeddings=[[1, 2, 3], [4, 5, 6]]).save()
@@ -477,15 +477,15 @@ def test_vector_array(self) -> None:
477477
register_vector(cursor.connection)
478478

479479
# this fails if the driver does not cast arrays
480-
item = Item.objects.get(pk=1) # type: ignore
480+
item = Item.objects.get(pk=1)
481481
assert item.embeddings == [[1, 2, 3], [4, 5, 6]]
482482

483483
def test_double_array(self) -> None:
484484
Item(id=1, double_embedding=[1, 1, 1]).save()
485485
Item(id=2, double_embedding=[2, 2, 2]).save()
486486
Item(id=3, double_embedding=[1, 1, 2]).save()
487487
distance = L2Distance(Cast('double_embedding', VectorField()), [1, 1, 1])
488-
items = Item.objects.annotate(distance=distance).order_by(distance) # type: ignore
488+
items = Item.objects.annotate(distance=distance).order_by(distance)
489489
assert [v.id for v in items] == [1, 3, 2]
490490
assert [v.distance for v in items] == [0, 1, sqrt(3)]
491491
assert items[1].double_embedding == [1, 1, 2]
@@ -495,14 +495,14 @@ def test_numeric_array(self) -> None:
495495
Item(id=2, numeric_embedding=[2, 2, 2]).save()
496496
Item(id=3, numeric_embedding=[1, 1, 2]).save()
497497
distance = L2Distance(Cast('numeric_embedding', VectorField()), [1, 1, 1])
498-
items = Item.objects.annotate(distance=distance).order_by(distance) # type: ignore
498+
items = Item.objects.annotate(distance=distance).order_by(distance)
499499
assert [v.id for v in items] == [1, 3, 2]
500500
assert [v.distance for v in items] == [0, 1, sqrt(3)]
501501
assert items[1].numeric_embedding == [1, 1, 2]
502502

503503
def test_half_precision(self) -> None:
504504
create_items()
505505
distance = L2Distance(Cast('embedding', HalfVectorField(dimensions=3)), [1, 1, 1])
506-
items = Item.objects.annotate(distance=distance).order_by(distance) # type: ignore
506+
items = Item.objects.annotate(distance=distance).order_by(distance)
507507
assert [v.id for v in items] == [1, 3, 2]
508508
assert [v.distance for v in items] == [0, 1, sqrt(3)]

0 commit comments

Comments
 (0)