Skip to content

Commit e566d4c

Browse files
committed
Improved tests [skip ci]
1 parent b6ccb30 commit e566d4c

File tree

9 files changed

+36
-36
lines changed

9 files changed

+36
-36
lines changed

tests/test_django.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ def setup_method(self):
165165
def test_vector(self):
166166
Item(id=1, embedding=[1, 2, 3]).save()
167167
item = Item.objects.get(pk=1)
168-
assert np.array_equal(item.embedding, np.array([1, 2, 3]))
168+
assert np.array_equal(item.embedding, [1, 2, 3])
169169
assert item.embedding.dtype == np.float32
170170

171171
def test_vector_l2_distance(self):
@@ -293,15 +293,15 @@ def test_vector_avg(self):
293293
Item(embedding=[1, 2, 3]).save()
294294
Item(embedding=[4, 5, 6]).save()
295295
avg = Item.objects.aggregate(Avg('embedding'))['embedding__avg']
296-
assert np.array_equal(avg, np.array([2.5, 3.5, 4.5]))
296+
assert np.array_equal(avg, [2.5, 3.5, 4.5])
297297

298298
def test_vector_sum(self):
299299
sum = Item.objects.aggregate(Sum('embedding'))['embedding__sum']
300300
assert sum is None
301301
Item(embedding=[1, 2, 3]).save()
302302
Item(embedding=[4, 5, 6]).save()
303303
sum = Item.objects.aggregate(Sum('embedding'))['embedding__sum']
304-
assert np.array_equal(sum, np.array([5, 7, 9]))
304+
assert np.array_equal(sum, [5, 7, 9])
305305

306306
def test_halfvec_avg(self):
307307
avg = Item.objects.aggregate(Avg('half_embedding'))['half_embedding__avg']
@@ -347,7 +347,7 @@ def test_vector_form_save(self):
347347
assert form.has_changed()
348348
assert form.is_valid()
349349
assert form.save()
350-
assert [4, 5, 6] == Item.objects.get(pk=1).embedding.tolist()
350+
assert np.array_equal(Item.objects.get(pk=1).embedding, [4, 5, 6])
351351

352352
def test_vector_form_save_missing(self):
353353
Item(id=1).save()
@@ -465,8 +465,8 @@ def test_vector_array(self):
465465

466466
# this fails if the driver does not cast arrays
467467
item = Item.objects.get(pk=1)
468-
assert item.embeddings[0].tolist() == [1, 2, 3]
469-
assert item.embeddings[1].tolist() == [4, 5, 6]
468+
assert np.array_equal(item.embeddings[0], [1, 2, 3])
469+
assert np.array_equal(item.embeddings[1], [4, 5, 6])
470470

471471
def test_double_array(self):
472472
Item(id=1, double_embedding=[1, 1, 1]).save()

tests/test_half_vector.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ def test_dimensions(self):
4949
def test_from_text(self):
5050
vec = HalfVector.from_text('[1.5,2,3]')
5151
assert vec.to_list() == [1.5, 2, 3]
52-
assert np.array_equal(vec.to_numpy(), np.array([1.5, 2, 3]))
52+
assert np.array_equal(vec.to_numpy(), [1.5, 2, 3])
5353

5454
def test_from_binary(self):
5555
data = pack('>HH3e', 3, 0, 1.5, 2, 3)
5656
vec = HalfVector.from_binary(data)
5757
assert vec.to_list() == [1.5, 2, 3]
58-
assert np.array_equal(vec.to_numpy(), np.array([1.5, 2, 3]))
58+
assert np.array_equal(vec.to_numpy(), [1.5, 2, 3])
5959
assert vec.to_binary() == data

tests/test_peewee.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def setup_method(self):
4343
def test_vector(self):
4444
Item.create(id=1, embedding=[1, 2, 3])
4545
item = Item.get_by_id(1)
46-
assert np.array_equal(item.embedding, np.array([1, 2, 3]))
46+
assert np.array_equal(item.embedding, [1, 2, 3])
4747
assert item.embedding.dtype == np.float32
4848

4949
def test_vector_l2_distance(self):
@@ -170,15 +170,15 @@ def test_vector_avg(self):
170170
Item.create(embedding=[1, 2, 3])
171171
Item.create(embedding=[4, 5, 6])
172172
avg = Item.select(fn.avg(Item.embedding).coerce(True)).scalar()
173-
assert np.array_equal(avg, np.array([2.5, 3.5, 4.5]))
173+
assert np.array_equal(avg, [2.5, 3.5, 4.5])
174174

175175
def test_vector_sum(self):
176176
sum = Item.select(fn.sum(Item.embedding).coerce(True)).scalar()
177177
assert sum is None
178178
Item.create(embedding=[1, 2, 3])
179179
Item.create(embedding=[4, 5, 6])
180180
sum = Item.select(fn.sum(Item.embedding).coerce(True)).scalar()
181-
assert np.array_equal(sum, np.array([5, 7, 9]))
181+
assert np.array_equal(sum, [5, 7, 9])
182182

183183
def test_halfvec_avg(self):
184184
avg = Item.select(fn.avg(Item.half_embedding).coerce(True)).scalar()
@@ -220,5 +220,5 @@ class Meta:
220220
# fails with column "embeddings" is of type vector[] but expression is of type text[]
221221
# ExtItem.create(id=1, embeddings=[np.array([1, 2, 3]), np.array([4, 5, 6])])
222222
# item = ExtItem.get_by_id(1)
223-
# assert np.array_equal(item.embeddings[0], np.array([1, 2, 3]))
224-
# assert np.array_equal(item.embeddings[1], np.array([4, 5, 6]))
223+
# assert np.array_equal(item.embeddings[0], [1, 2, 3])
224+
# assert np.array_equal(item.embeddings[1], [4, 5, 6])

tests/test_psycopg.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,23 @@ def test_vector_text_format_non_contiguous(self):
4646
embedding = np.flipud(np.array([1.5, 2, 3]))
4747
assert not embedding.data.contiguous
4848
res = conn.execute('SELECT %t::vector', (embedding,)).fetchone()[0]
49-
assert np.array_equal(res, np.array([3, 2, 1.5]))
49+
assert np.array_equal(res, [3, 2, 1.5])
5050

5151
def test_vector_binary_format_non_contiguous(self):
5252
embedding = np.flipud(np.array([1.5, 2, 3]))
5353
assert not embedding.data.contiguous
5454
res = conn.execute('SELECT %b::vector', (embedding,)).fetchone()[0]
55-
assert np.array_equal(res, np.array([3, 2, 1.5]))
55+
assert np.array_equal(res, [3, 2, 1.5])
5656

5757
def test_vector_class_binary_format(self):
5858
embedding = Vector([1.5, 2, 3])
5959
res = conn.execute('SELECT %b::vector', (embedding,), binary=True).fetchone()[0]
60-
assert np.array_equal(res, np.array([1.5, 2, 3]))
60+
assert np.array_equal(res, [1.5, 2, 3])
6161

6262
def test_vector_class_text_format(self):
6363
embedding = Vector([1.5, 2, 3])
6464
res = conn.execute('SELECT %t::vector', (embedding,)).fetchone()[0]
65-
assert np.array_equal(res, np.array([1.5, 2, 3]))
65+
assert np.array_equal(res, [1.5, 2, 3])
6666

6767
def test_halfvec(self):
6868
embedding = HalfVector([1.5, 2, 3])
@@ -182,7 +182,7 @@ def configure(conn):
182182

183183
with pool.connection() as conn:
184184
res = conn.execute("SELECT '[1,2,3]'::vector").fetchone()
185-
assert np.array_equal(res[0], np.array([1, 2, 3]))
185+
assert np.array_equal(res[0], [1, 2, 3])
186186

187187
pool.close()
188188

@@ -218,6 +218,6 @@ async def configure(conn):
218218
async with conn.cursor() as cur:
219219
await cur.execute("SELECT '[1,2,3]'::vector")
220220
res = await cur.fetchone()
221-
assert np.array_equal(res[0], np.array([1, 2, 3]))
221+
assert np.array_equal(res[0], [1, 2, 3])
222222

223223
await pool.close()

tests/test_psycopg2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def test_pool(self):
122122
cur = conn.cursor()
123123
cur.execute("SELECT '[1,2,3]'::vector")
124124
res = cur.fetchone()
125-
assert np.array_equal(res[0], np.array([1, 2, 3]))
125+
assert np.array_equal(res[0], [1, 2, 3])
126126
finally:
127127
pool.putconn(conn)
128128

tests/test_sparse_vector.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class TestSparseVector:
99
def test_list(self):
1010
vec = SparseVector([1, 0, 2, 0, 3, 0])
1111
assert vec.to_list() == [1, 0, 2, 0, 3, 0]
12-
assert vec.to_numpy().tolist() == [1, 0, 2, 0, 3, 0]
12+
assert np.array_equal(vec.to_numpy(), [1, 0, 2, 0, 3, 0])
1313
assert vec.indices() == [0, 2, 4]
1414

1515
def test_list_dimensions(self):
@@ -69,7 +69,7 @@ def test_values(self):
6969
assert SparseVector([1, 0, 2, 0, 3, 0]).values() == [1, 2, 3]
7070

7171
def test_to_coo(self):
72-
assert SparseVector([1, 0, 2, 0, 3, 0]).to_coo().toarray().tolist() == [[1, 0, 2, 0, 3, 0]]
72+
assert np.array_equal(SparseVector([1, 0, 2, 0, 3, 0]).to_coo().toarray(), [[1, 0, 2, 0, 3, 0]])
7373

7474
def test_zero_vector_text(self):
7575
vec = SparseVector({}, 3)
@@ -81,7 +81,7 @@ def test_from_text(self):
8181
assert vec.indices() == [0, 2, 4]
8282
assert vec.values() == [1.5, 2, 3]
8383
assert vec.to_list() == [1.5, 0, 2, 0, 3, 0]
84-
assert np.array_equal(vec.to_numpy(), np.array([1.5, 0, 2, 0, 3, 0]))
84+
assert np.array_equal(vec.to_numpy(), [1.5, 0, 2, 0, 3, 0])
8585

8686
def test_from_binary(self):
8787
data = pack('>iii3i3f', 6, 3, 0, 0, 2, 4, 1.5, 2, 3)
@@ -90,5 +90,5 @@ def test_from_binary(self):
9090
assert vec.indices() == [0, 2, 4]
9191
assert vec.values() == [1.5, 2, 3]
9292
assert vec.to_list() == [1.5, 0, 2, 0, 3, 0]
93-
assert np.array_equal(vec.to_numpy(), np.array([1.5, 0, 2, 0, 3, 0]))
93+
assert np.array_equal(vec.to_numpy(), [1.5, 0, 2, 0, 3, 0])
9494
assert vec.to_binary() == data

tests/test_sqlalchemy.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ def test_vector(self, engine):
201201
session.add(Item(id=1, embedding=[1, 2, 3]))
202202
session.commit()
203203
item = session.get(Item, 1)
204-
assert item.embedding.tolist() == [1, 2, 3]
204+
assert np.array_equal(item.embedding, [1, 2, 3])
205205

206206
def test_vector_l2_distance(self, engine):
207207
create_items()
@@ -509,7 +509,7 @@ def test_automap(self, engine):
509509
with Session(engine) as session:
510510
session.execute(insert(AutoItem), [{'embedding': np.array([1, 2, 3])}])
511511
item = session.query(AutoItem).first()
512-
assert item.embedding.tolist() == [1, 2, 3]
512+
assert np.array_equal(item.embedding, [1, 2, 3])
513513

514514
def test_half_precision(self, engine):
515515
create_items()
@@ -541,8 +541,8 @@ def test_vector_array(self, engine):
541541

542542
# this fails if the driver does not cast arrays
543543
item = session.get(Item, 1)
544-
assert item.embeddings[0].tolist() == [1, 2, 3]
545-
assert item.embeddings[1].tolist() == [4, 5, 6]
544+
assert np.array_equal(item.embeddings[0], [1, 2, 3])
545+
assert np.array_equal(item.embeddings[1], [4, 5, 6])
546546

547547
def test_halfvec_array(self, engine):
548548
with Session(engine) as session:
@@ -621,7 +621,7 @@ async def test_avg(self, engine):
621621
session.add(Item(embedding=[1, 2, 3]))
622622
session.add(Item(embedding=[4, 5, 6]))
623623
res = await session.scalars(select(avg(Item.embedding)))
624-
assert res.first().tolist() == [2.5, 3.5, 4.5]
624+
assert np.array_equal(res.first(), [2.5, 3.5, 4.5])
625625

626626
await engine.dispose()
627627

@@ -639,12 +639,12 @@ async def test_vector_array(self, engine):
639639
async with session.begin():
640640
session.add(Item(id=1, embeddings=[Vector([1, 2, 3]), Vector([4, 5, 6])]))
641641
item = await session.get(Item, 1)
642-
assert item.embeddings[0].tolist() == [1, 2, 3]
643-
assert item.embeddings[1].tolist() == [4, 5, 6]
642+
assert np.array_equal(item.embeddings[0], [1, 2, 3])
643+
assert np.array_equal(item.embeddings[1], [4, 5, 6])
644644

645645
session.add(Item(id=2, embeddings=[np.array([1, 2, 3]), np.array([4, 5, 6])]))
646646
item = await session.get(Item, 2)
647-
assert item.embeddings[0].tolist() == [1, 2, 3]
648-
assert item.embeddings[1].tolist() == [4, 5, 6]
647+
assert np.array_equal(item.embeddings[0], [1, 2, 3])
648+
assert np.array_equal(item.embeddings[1], [4, 5, 6])
649649

650650
await engine.dispose()

tests/test_sqlmodel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def test_vector(self):
7676
session.add(Item(id=1, embedding=[1, 2, 3]))
7777
session.commit()
7878
item = session.get(Item, 1)
79-
assert item.embedding.tolist() == [1, 2, 3]
79+
assert np.array_equal(item.embedding, np.array([1, 2, 3]))
8080

8181
def test_vector_l2_distance(self):
8282
create_items()

tests/test_vector.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ def test_dimensions(self):
4949
def test_from_text(self):
5050
vec = Vector.from_text('[1.5,2,3]')
5151
assert vec.to_list() == [1.5, 2, 3]
52-
assert np.array_equal(vec.to_numpy(), np.array([1.5, 2, 3]))
52+
assert np.array_equal(vec.to_numpy(), [1.5, 2, 3])
5353

5454
def test_from_binary(self):
5555
data = pack('>HH3f', 3, 0, 1.5, 2, 3)
5656
vec = Vector.from_binary(data)
5757
assert vec.to_list() == [1.5, 2, 3]
58-
assert np.array_equal(vec.to_numpy(), np.array([1.5, 2, 3]))
58+
assert np.array_equal(vec.to_numpy(), [1.5, 2, 3])
5959
assert vec.to_binary() == data

0 commit comments

Comments
 (0)