Improved code [skip ci]

Author: ankane

pgvector/django/halfvec.py

@@ -25,7 +25,7 @@ def db_type(self, connection: Any) -> str:
         return 'halfvec(%d)' % self.dimensions
 
     def from_db_value(self, value: Any, expression: Any, connection: Any) -> list[float] | None:
-        return None if value is None else HalfVector._from_db(value)
+        return HalfVector._from_db(value)
 
     def to_python(self, value: Any) -> list[float] | None:
         if value is None or isinstance(value, list):

pgvector/django/vector.py

@@ -25,7 +25,7 @@ def db_type(self, connection: Any) -> str:
         return 'vector(%d)' % self.dimensions
 
     def from_db_value(self, value: Any, expression: Any, connection: Any) -> list[float] | None:
-        return None if value is None else Vector._from_db(value)
+        return Vector._from_db(value)
 
     def to_python(self, value: Any) -> list[float] | None:
         if value is None or isinstance(value, list):

pgvector/halfvec.py

@@ -96,7 +96,10 @@ def _to_db_binary(cls, value: object) -> bytes | None:
         return value.to_binary()
 
     @classmethod
-    def _from_db(cls, value: str | HalfVector) -> list[float]:
+    def _from_db(cls, value: str | HalfVector | None) -> list[float] | None:
+        if value is None:
+            return value
+
         if isinstance(value, str):
             value = cls.from_text(value)
 

pgvector/peewee/halfvec.py

@@ -17,7 +17,7 @@ def db_value(self, value: object) -> str | None:
         return HalfVector._to_db(value)
 
     def python_value(self, value: Any) -> list[float] | None:
-        return None if value is None else HalfVector._from_db(value)
+        return HalfVector._from_db(value)
 
     def _distance(self, op: str, vector: object) -> Expression:
         return Expression(lhs=self, op=op, rhs=self.to_value(vector))

pgvector/peewee/vector.py

@@ -17,7 +17,7 @@ def db_value(self, value: object) -> str | None:
         return Vector._to_db(value)
 
     def python_value(self, value: Any) -> list[float] | None:
-        return None if value is None else Vector._from_db(value)
+        return Vector._from_db(value)
 
     def _distance(self, op: str, vector: object) -> Expression:
         return Expression(lhs=self, op=op, rhs=self.to_value(vector))

pgvector/sqlalchemy/halfvec.py

@@ -32,7 +32,7 @@ def process(value: Any) -> Any:
 
     def result_processor(self, dialect: Dialect, coltype: Any) -> Any:
         def process(value: Any) -> list[float] | None:
-            return None if value is None else HalfVector._from_db(value)
+            return HalfVector._from_db(value)
         return process
 
     class Comparator(TypeEngine.Comparator[Any]):

pgvector/sqlalchemy/vector.py

@@ -32,7 +32,7 @@ def process(value: Any) -> Any:
 
     def result_processor(self, dialect: Dialect, coltype: Any) -> Any:
         def process(value: Any) -> list[float] | None:
-            return None if value is None else Vector._from_db(value)
+            return Vector._from_db(value)
         return process
 
     class Comparator(TypeEngine.Comparator[Any]):

pgvector/vector.py

@@ -96,7 +96,10 @@ def _to_db_binary(cls, value: object) -> bytes | None:
         return value.to_binary()
 
     @classmethod
-    def _from_db(cls, value: str | Vector) -> list[float]:
+    def _from_db(cls, value: str | Vector | None) -> list[float] | None:
+        if value is None:
+            return value
+
         if isinstance(value, str):
             value = cls.from_text(value)