Use consistent __str__ representation [skip ci]

ankane · ankane · commit a3dc9166cbc1 · 2024-06-01T19:44:52.000-07:00
diff --git a/pgvector/utils/bit.py b/pgvector/utils/bit.py
@@ -14,11 +14,8 @@ def __init__(self, value):
 
             self._value = value
 
-    def __str__(self):
-        return self.to_text()
-
     def __repr__(self):
-        return f'Bit({self})'
+        return f'Bit({self.to_text()})'
 
     def dim(self):
         return self._value.shape[0]
diff --git a/tests/test_bit.py b/tests/test_bit.py
@@ -11,7 +11,7 @@ def test_tuple(self):
         assert Bit((True, False, True)).to_list() == [True, False, True]
 
     def test_str(self):
-        assert str(Bit('101')) == '101'
+        assert Bit('101').to_list() == [True, False, True]
 
     def test_ndarray_same_object(self):
         arr = np.array([True, False, True])
@@ -30,3 +30,4 @@ def test_ndim_zero(self):
 
     def test_repr(self):
         assert repr(Bit([True, False, True])) == 'Bit(101)'
+        assert str(Bit([True, False, True])) == 'Bit(101)'
diff --git a/tests/test_half_vector.py b/tests/test_half_vector.py
@@ -36,3 +36,4 @@ def test_ndim_zero(self):
 
     def test_repr(self):
         assert repr(HalfVector([1, 2, 3])) == 'HalfVector([1.0, 2.0, 3.0])'
+        assert str(HalfVector([1, 2, 3])) == 'HalfVector([1.0, 2.0, 3.0])'
diff --git a/tests/test_psycopg.py b/tests/test_psycopg.py
@@ -91,14 +91,12 @@ def test_bit(self):
     def test_bit_binary_format(self):
         embedding = Bit([False, True, False, True, False, False, False, False, True])
         res = conn.execute('SELECT %b::bit(9)', (embedding,), binary=True).fetchone()[0]
-        assert str(Bit.from_binary(res)) == '010100001'
         assert repr(Bit.from_binary(res)) == 'Bit(010100001)'
 
     def test_bit_text_format(self):
         embedding = Bit([False, True, False, True, False, False, False, False, True])
         res = conn.execute('SELECT %t::bit(9)', (embedding,)).fetchone()[0]
         assert res == '010100001'
-        assert str(Bit(res)) == '010100001'
         assert repr(Bit(res)) == 'Bit(010100001)'
 
     def test_sparsevec(self):
diff --git a/tests/test_sparse_vector.py b/tests/test_sparse_vector.py
@@ -10,3 +10,4 @@ def test_from_dense(self):
 
     def test_repr(self):
         assert repr(SparseVector.from_dense([1, 2, 3])) == 'SparseVector(3, [0, 1, 2], [1, 2, 3])'
+        assert str(SparseVector.from_dense([1, 2, 3])) == 'SparseVector(3, [0, 1, 2], [1, 2, 3])'
diff --git a/tests/test_vector.py b/tests/test_vector.py
@@ -36,3 +36,4 @@ def test_ndim_zero(self):
 
     def test_repr(self):
         assert repr(Vector([1, 2, 3])) == 'Vector([1.0, 2.0, 3.0])'
+        assert str(Vector([1, 2, 3])) == 'Vector([1.0, 2.0, 3.0])'

Original file line number	Diff line number	Diff line change
`@@ -36,3 +36,4 @@ def test_ndim_zero(self):`
`36`	`36`
`37`	`37`	`def test_repr(self):`
`38`	`38`	`assert repr(HalfVector([1, 2, 3])) == 'HalfVector([1.0, 2.0, 3.0])'`
	`39`	`+ assert str(HalfVector([1, 2, 3])) == 'HalfVector([1.0, 2.0, 3.0])'`
Original file line number	Diff line number	Diff line change
`@@ -10,3 +10,4 @@ def test_from_dense(self):`
`10`	`10`
`11`	`11`	`def test_repr(self):`
`12`	`12`	`assert repr(SparseVector.from_dense([1, 2, 3])) == 'SparseVector(3, [0, 1, 2], [1, 2, 3])'`
	`13`	`+ assert str(SparseVector.from_dense([1, 2, 3])) == 'SparseVector(3, [0, 1, 2], [1, 2, 3])'`