Renamed utils methods

ankane · ankane · commit 7423dc404945 · 2021-06-13T12:38:33.000-07:00
diff --git a/pgvector/django/__init__.py b/pgvector/django/__init__.py
@@ -1,7 +1,7 @@
 from django.contrib.postgres.operations import CreateExtension
 from django.contrib.postgres.indexes import PostgresIndex
 from django.db.models import Field, FloatField, Func
-from ..utils import cast_vector, quote_vector
+from ..utils import from_db, to_db
 
 __all__ = ['VectorExtension', 'VectorField', 'IvfflatIndex', 'L2Distance', 'MaxInnerProduct', 'CosineDistance']
 
@@ -31,13 +31,13 @@ def db_type(self, connection):
         return 'vector(%d)' % self.dimensions
 
     def from_db_value(self, value, expression, connection):
-        return cast_vector(value)
+        return from_db(value)
 
     def to_python(self, value):
-        return cast_vector(value)
+        return from_db(value)
 
     def get_prep_value(self, value):
-        return quote_vector(value)
+        return to_db(value)
 
 
 class IvfflatIndex(PostgresIndex):
diff --git a/pgvector/psycopg2/__init__.py b/pgvector/psycopg2/__init__.py
@@ -1,7 +1,7 @@
 import numpy as np
 import psycopg2
 from psycopg2.extensions import adapt, new_type, register_adapter, register_type
-from ..utils import cast_vector, quote_vector
+from ..utils import from_db, to_db
 
 __all__ = ['register_vector']
 
@@ -11,11 +11,11 @@ def __init__(self, vector):
         self._vector = vector
 
     def getquoted(self):
-        return adapt(quote_vector(self._vector)).getquoted()
+        return adapt(to_db(self._vector)).getquoted()
 
 
-def cast_vector_type(value, cur):
-    return cast_vector(value)
+def cast_vector(value, cur):
+    return from_db(value)
 
 
 def register_vector(conn_or_curs=None):
@@ -27,6 +27,6 @@ def register_vector(conn_or_curs=None):
     except psycopg2.errors.UndefinedObject:
         raise psycopg2.ProgrammingError('vector type not found in the database')
 
-    vector = new_type((oid,), 'VECTOR', cast_vector_type)
+    vector = new_type((oid,), 'VECTOR', cast_vector)
     register_type(vector)
     register_adapter(np.ndarray, VectorAdapter)
diff --git a/pgvector/sqlalchemy/__init__.py b/pgvector/sqlalchemy/__init__.py
@@ -1,5 +1,5 @@
 from sqlalchemy.types import UserDefinedType
-from ..utils import cast_vector, quote_vector
+from ..utils import from_db, to_db
 
 __all__ = ['Vector']
 
@@ -16,12 +16,12 @@ def get_col_spec(self, **kw):
 
     def bind_processor(self, dialect):
         def process(value):
-            return quote_vector(value, self.dim)
+            return to_db(value, self.dim)
         return process
 
     def result_processor(self, dialect, coltype):
         def process(value):
-            return cast_vector(value)
+            return from_db(value)
         return process
 
     class comparator_factory(UserDefinedType.Comparator):
diff --git a/pgvector/utils/__init__.py b/pgvector/utils/__init__.py
@@ -1,15 +1,15 @@
 import numpy as np
 
 
-def cast_vector(value):
+def from_db(value):
     # could be ndarray if already cast by lower-level driver
     if value is None or isinstance(value, np.ndarray):
         return value
 
     return np.array(value[1:-1].split(','), dtype=np.float32)
 
 
-def quote_vector(value, dim=None):
+def to_db(value, dim=None):
     if value is None:
         return value
 
