Merge branch 'master' into numpy-dep

Author: ankane

pgvector/pg8000/register.py

@@ -1,11 +1,6 @@
 from pg8000.native import Connection
 from .. import Vector, HalfVector, SparseVector
 
-try:
-    import numpy as np
-except ImportError:
-    np = None
-
 
 def register_vector(conn: Connection) -> None:
     # use to_regtype to get first matching type in search path
@@ -16,8 +11,11 @@ def register_vector(conn: Connection) -> None:
         raise RuntimeError('vector type not found in the database')
 
     conn.register_out_adapter(Vector, Vector._to_db)
-    if np is not None:
+    try:
+        import numpy as np
         conn.register_out_adapter(np.ndarray, Vector._to_db)
+    except ImportError:
+        pass
     conn.register_in_adapter(type_info['vector'], Vector._from_db)
 
     if 'halfvec' in type_info:

pgvector/psycopg2/vector.py

@@ -1,11 +1,6 @@
 from psycopg2.extensions import adapt, connection, cursor, new_array_type, new_type, register_adapter, register_type
 from .. import Vector
 
-try:
-    import numpy as np
-except ImportError:
-    np = None
-
 
 class VectorAdapter:
     def __init__(self, value: object) -> None:
@@ -27,6 +22,9 @@ def register_vector_info(oid: int, array_oid: int | None, scope: connection | cu
         vectorarray = new_array_type((array_oid,), 'VECTORARRAY', vector)
         register_type(vectorarray, scope)
 
-    if np is not None:
-        register_adapter(np.ndarray, VectorAdapter)
     register_adapter(Vector, VectorAdapter)
+    try:
+        import numpy as np
+        register_adapter(np.ndarray, VectorAdapter)
+    except ImportError:
+        pass