8000 Added PgVector integration by chandr-andr · Pull Request #102 · psqlpy-python/psqlpy · GitHub
[go: up one dir, main page]
Skip to content

Added PgVector integration #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 19, 2024
Merged

Added PgVector integration #102

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c903e5
Added PgVector integration
chandr-andr Nov 18, 2024
37b1b78
Added PgVector integration
chandr-andr Nov 19, 2024
8ac7bc9
Added PgVector integration
chandr-andr Nov 19, 2024
b50c4fb
Added PgVector integration
chandr-andr Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added PgVector integration 
Signed-off-by: chandr-andr (Kiselev Aleksandr) <chandr@chandr.net>
  • Loading branch information
@chandr-andr
chandr-andr committed Nov 19, 2024
commit 37b1b782f38661342dee0a63b9658c5d0c6c5a18
11 changes: 10 additions & 1 deletion python/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,16 @@ async def psql_pool_with_cert_file(


@pytest.fixture(autouse=True)
async def create_deafult_data_for_tests(
async def setup_postgresql_for_tests(
psql_pool: ConnectionPool,
) -> None:
await psql_pool.execute(
"CREATE EXTENSION IF NOT EXISTS vector;",
)


@pytest.fixture(autouse=True)
async def create_default_data_for_tests(
psql_pool: ConnectionPool,
table_name: str,
number_database_records: int,
Expand Down
6 changes: 6 additions & 0 deletions python/tests/test_value_converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
MoneyArray,
NumericArray,
PathArray,
PgVector,
PointArray,
PyBox,
PyCircle,
Expand Down Expand Up @@ -609,6 +610,11 @@ async def test_as_class(
[datetime.timedelta(days=100, microseconds=100), datetime.timedelta(days=100, microseconds=100)],
[datetime.timedelta(days=100, microseconds=100), datetime.timedelta(days=100, microseconds=100)],
),
(
"VECTOR",
PgVector([123123, 1222211, 9999112, 12999873]),
< 10000 /td> [123123, 1222211, 9999112, 12999873],
),
),
)
async def test_deserialization_simple_into_python(
Expand Down
213 changes: 128 additions & 85 deletions src/value_converter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1325,19 +1325,18 @@ fn postgres_bytes_to_py(
// ---------- Bytes Types ----------
// Convert BYTEA type into Vector<u8>, then into PyBytes
Type::BYTEA => {
let vec_of_bytes = _composite_field_postgres_to_py::<Option<Vec<u8>>>(
type_, buf, is_simple,
)?;
let vec_of_bytes =
_composite_field_postgres_to_py::<Option<Vec<u8>>>(type_, buf, is_simple)?;
if let Some(vec_of_bytes) = vec_of_bytes {
return Ok(PyBytes::new_bound(py, &vec_of_bytes).to_object(py));
}
Ok(py.None())
},
}
// // ---------- String Types ----------
// // Convert TEXT and VARCHAR type into String, then into str
Type::TEXT | Type::VARCHAR | Type::XML => Ok(_composite_field_postgres_to_py::<Option<String>>(
type_, buf, is_simple,
)?
Type::TEXT | Type::VARCHAR | Type::XML => Ok(_composite_field_postgres_to_py::<
Option<String>,
>(type_, buf, is_simple)?
.to_object(py)),
// ---------- Boolean Types ----------
// Convert BOOL type into bool
Expand All @@ -1354,9 +1353,10 @@ fn postgres_bytes_to_py(
_composite_field_postgres_to_py::<Option<i32>>(type_, buf, is_simple)?.to_object(py),
),
// Convert BigInt into i64, then into int
Type::INT8 | Type::MONEY => Ok(
_composite_field_postgres_to_py::<Option<i64>>(type_, buf, is_simple)?.to_object(py),
),
Type::INT8 | Type::MONEY => Ok(_composite_field_postgres_to_py::<Option<i64>>(
type_, buf, is_simple,
)?
.to_object(py)),
// Convert REAL into f32, then into float
Type::FLOAT4 => Ok(
_composite_field_postgres_to_py::<Option<f32>>(type_, buf, is_simple)?.to_object(py),
Expand Down Expand Up @@ -1432,16 +1432,17 @@ fn postgres_bytes_to_py(
}
}
Type::NUMERIC => {
if let Some(numeric_) = _composite_field_postgres_to_py::<Option<Decimal>>(
type_, buf, is_simple,
)? {
if let Some(numeric_) =
_composite_field_postgres_to_py::<Option<Decimal>>(type_, buf, is_simple)?
{
return Ok(InnerDecimal(numeric_).to_object(py));
}
Ok(py.None().to_object(py))
}
// ---------- Geo Types ----------
Type::POINT => {
let point_ = _composite_field_postgres_to_py::<Option<RustPoint>>(type_, buf, is_simple)?;
let point_ =
_composite_field_postgres_to_py::<Option<RustPoint>>(type_, buf, is_simple)?;

match point_ {
Some(point_) => Ok(point_.into_py(py)),
Expand All @@ -1457,7 +1458,8 @@ fn postgres_bytes_to_py(
}
}
Type::PATH => {
let path_ = _composite_field_postgres_to_py::<Option<RustLineString>>(type_, buf, is_simple)?;
let path_ =
_composite_field_postgres_to_py::<Option<RustLineString>>(type_, buf, is_simple)?;

match path_ {
Some(path_) => Ok(path_.into_py(py)),
Expand All @@ -1473,7 +1475,8 @@ fn postgres_bytes_to_py(
}
}
Type::LSEG => {
let lseg_ = _composite_field_postgres_to_py::<Option<RustLineSegment>>(type_, buf, is_simple)?;
let lseg_ =
_composite_field_postgres_to_py::<Option<RustLineSegment>>(type_, buf, is_simple)?;

match lseg_ {
Some(lseg_) => Ok(lseg_.into_py(py)),
Expand All @@ -1489,139 +1492,179 @@ fn postgres_bytes_to_py(
}
}
Type::INTERVAL => {
let interval = _composite_field_postgres_to_py::<Option<Interval>>(type_, buf, is_simple)?;
let interval =
_composite_field_postgres_to_py::<Option<Interval>>(type_, buf, is_simple)?;
if let Some(interval) = interval {
return Ok(InnerInterval(interval).to_object(py));
}
Ok(py.None())
}
// ---------- Array Text Types ----------
Type::BOOL_ARRAY => Ok(postgres_array_to_py(py, _composite_field_postgres_to_py::<Option<Array<bool>>>(
type_, buf, is_simple,
)?)
Type::BOOL_ARRAY => Ok(postgres_array_to_py(
py,
_composite_field_postgres_to_py::<Option<Array<bool>>>(type_, buf, is_simple)?,
)
.to_object(py)),
// Convert ARRAY of TEXT or VARCHAR into Vec<String>, then into list[str]
Type::TEXT_ARRAY | Type::VARCHAR_ARRAY | Type::XML_ARRAY => Ok(
postgres_array_to_py(
py,
_composite_field_postgres_to_py::<Option<Array<String>>>(type_, buf, is_simple)?,
).to_object(py)),
Type::TEXT_ARRAY | Type::VARCHAR_ARRAY | Type::XML_ARRAY => Ok(postgres_array_to_py(
py,
_composite_field_postgres_to_py::<Option<Array<String>>>(type_, buf, is_simple)?,
)
.to_object(py)),
// ---------- Array Integer Types ----------
// Convert ARRAY of SmallInt into Vec<i16>, then into list[int]
Type::INT2_ARRAY => Ok(
postgres_array_to_py(
py,
_composite_field_postgres_to_py::<Option<Array<i16>>>(
type_, buf, is_simple,
)?,
Type::INT2_ARRAY => Ok(postgres_array_to_py(
py,
_composite_field_postgres_to_py::<Option<Array<i16>>>(type_, buf, is_simple)?,
)
.to_object(py)),
// Convert ARRAY of Integer into Vec<i32>, then into list[int]
Type::INT4_ARRAY => {
Ok(postgres_array_to_py(
py,
_composite_field_postgres_to_py::<Option<Array<i32>>>(
type_,
buf,
is_simple,
)?
).to_object(py))
},
Type::INT4_ARRAY => Ok(postgres_array_to_py(
py,
_composite_field_postgres_to_py::<Option<Array<i32>>>(type_, buf, is_simple)?,
)
.to_object(py)),
// Convert ARRAY of BigInt into Vec<i64>, then into list[int]
Type::INT8_ARRAY | Type::MONEY_ARRAY => Ok(postgres_array_to_py(py, _composite_field_postgres_to_py::<Option<Array<i64>>>(
type_, buf, is_simple,
)?).to_object(py)),
Type::INT8_ARRAY | Type::MONEY_ARRAY => Ok(postgres_array_to_py(
py,
_composite_field_postgres_to_py::<Option<Array<i64>>>(type_, buf, is_simple)?,
)
.to_object(py)),
// Convert ARRAY of Float4 into Vec<f32>, then into list[float]
Type::FLOAT4_ARRAY => Ok(postgres_array_to_py(py,_composite_field_postgres_to_py::<Option<Array<f32>>>(
type_, buf, is_simple,
)?)
Type::FLOAT4_ARRAY => Ok(postgres_array_to_py(
py,
_composite_field_postgres_to_py::<Option<Array<f32>>>(type_, buf, is_simple)?,
)
.to_object(py)),
// Convert ARRAY of Float8 into Vec<f64>, then into list[float]
Type::FLOAT8_ARRAY => Ok(postgres_array_to_py(py,_composite_field_postgres_to_py::<Option<Array<f64>>>(
type_, buf, is_simple,
)?)
Type::FLOAT8_ARRAY => Ok(postgres_array_to_py(
py,
_composite_field_postgres_to_py::<Option<Array<f64>>>(type_, buf, is_simple)?,
)
.to_object(py)),
// Convert ARRAY of Date into Vec<NaiveDate>, then into list[datetime.date]
Type::DATE_ARRAY => Ok(postgres_array_to_py(py,_composite_field_postgres_to_py::<Option<Array<NaiveDate>>>(
type_, buf, is_simple,
)?)
Type::DATE_ARRAY => Ok(postgres_array_to_py(
py,
_composite_field_postgres_to_py::<Option<Array<NaiveDate>>>(type_, buf, is_simple)?,
)
.to_object(py)),
// Convert ARRAY of Time into Vec<NaiveTime>, then into list[datetime.date]
Type::TIME_ARRAY => Ok(postgres_array_to_py(py, _composite_field_postgres_to_py::<Option<Array<NaiveTime>>>(
type_, buf, is_simple,
)?)
Type::TIME_ARRAY => Ok(postgres_array_to_py(
py,
_composite_field_postgres_to_py::<Option<Array<NaiveTime>>>(type_, buf, is_simple)?,
)
.to_object(py)),
// Convert ARRAY of TIMESTAMP into Vec<NaiveDateTime>, then into list[datetime.date]
Type::TIMESTAMP_ARRAY => Ok(
postgres_array_to_py(py, _composite_field_postgres_to_py::<Option<Array<NaiveDateTime>>>(type_, buf, is_simple)?)
.to_object(py),
),
Type::TIMESTAMP_ARRAY => Ok(postgres_array_to_py(
py,
_composite_field_postgres_to_py::<Option<Array<NaiveDateTime>>>(type_, buf, is_simple)?,
)
.to_object(py)),
// Convert ARRAY of TIMESTAMPTZ into Vec<DateTime<FixedOffset>>, then into list[datetime.date]
Type::TIMESTAMPTZ_ARRAY => Ok(postgres_array_to_py(py, _composite_field_postgres_to_py::<
Option<Array<DateTime<FixedOffset>>>,
>(type_, buf, is_simple)?)
Type::TIMESTAMPTZ_ARRAY => Ok(postgres_array_to_py(
py,
_composite_field_postgres_to_py::<Option<Array<DateTime<FixedOffset>>>>(
type_, buf, is_simple,
)?,
)
.to_object(py)),
// Convert ARRAY of UUID into Vec<Array<InternalUuid>>, then into list[UUID]
Type::UUID_ARRAY => {
let uuid_array =
_composite_field_postgres_to_py::<Option<Array<InternalUuid>>>(type_, buf, is_simple)?;
let uuid_array = _composite_field_postgres_to_py::<Option<Array<InternalUuid>>>(
type_, buf, is_simple,
)?;
Ok(postgres_array_to_py(py, uuid_array).to_object(py))
}
// Convert ARRAY of INET into Vec<INET>, then into list[IPv4Address | IPv6Address]
Type::INET_ARRAY => Ok(postgres_array_to_py(py, _composite_field_postgres_to_py::<Option<Array<IpAddr>>>(
type_, buf, is_simple,
)?)
Type::INET_ARRAY => Ok(postgres_array_to_py(
py,
_composite_field_postgres_to_py::<Option<Array<IpAddr>>>(type_, buf, is_simple)?,
)
.to_object(py)),
Type::JSONB_ARRAY | Type::JSON_ARRAY => {
let db_json_array =
_composite_field_postgres_to_py::<Option<Array<InternalSerdeValue>>>(type_, buf, is_simple)?;
let db_json_array = _composite_field_postgres_to_py::<Option<Array<InternalSerdeValue>>>(
type_, buf, is_simple,
)?;
Ok(postgres_array_to_py(py, db_json_array).to_object(py))
}
Type::NUMERIC_ARRAY => {
Ok(postgres_array_to_py(py, _composite_field_postgres_to_py::<Option<Array<InnerDecimal>>>(
type_, buf, is_simple,
)?).to_object(py))
},
Type::NUMERIC_ARRAY => Ok(postgres_array_to_py(
py,
_composite_field_postgres_to_py::<Option<Array<InnerDecimal>>>(type_, buf, is_simple)?,
)
.to_object(py)),
// ---------- Array Geo Types ----------
Type::POINT_ARRAY => {
let point_array_ = _composite_field_postgres_to_py::<Option<Array<RustPoint>>>(type_, buf, is_simple)?;
let point_array_ =
_composite_field_postgres_to_py::<Option<Array<RustPoint>>>(type_, buf, is_simple)?;

Ok(postgres_array_to_py(py, point_array_).to_object(py))
}
Type::BOX_ARRAY => {
let box_array_ = _composite_field_postgres_to_py::<Option<Array<RustRect>>>(type_, buf, is_simple)?;
let box_array_ =
_composite_field_postgres_to_py::<Option<Array<RustRect>>>(type_, buf, is_simple)?;

Ok(postgres_array_to_py(py, box_array_).to_object(py))
}
Type::PATH_ARRAY => {
let path_array_ = _composite_field_postgres_to_py::<Option<Array<RustLineString>>>(type_, buf, is_simple)?;
let path_array_ = _composite_field_postgres_to_py::<Option<Array<RustLineString>>>(
type_, buf, is_simple,
)?;

Ok(postgres_array_to_py(py, path_array_).to_object(py))
}
Type::LINE_ARRAY => {
let line_array_ = _composite_field_postgres_to_py::<Option<Array<Line>>>(type_, buf, is_simple)?;
let line_array_ =
_composite_field_postgres_to_py::<Option<Array<Line>>>(type_, buf, is_simple)?;

Ok(postgres_array_to_py(py, line_array_).to_object(py))
}
Type::LSEG_ARRAY => {
let lseg_array_ = _composite_field_postgres_to_py::<Option<Array<RustLineSegment>>>(type_, buf, is_simple)?;
let lseg_array_ = _composite_field_postgres_to_py::<Option<Array<RustLineSegment>>>(
type_, buf, is_simple,
)?;

Ok(postgres_array_to_py(py, lseg_array_).to_object(py))
}
Type::CIRCLE_ARRAY => {
let circle_array_ = _composite_field_postgres_to_py::<Option<Array<Circle>>>(type_, buf, is_simple)?;
let circle_array_ =
_composite_field_postgres_to_py::<Option<Array<Circle>>>(type_, buf, is_simple)?;

Ok(postgres_array_to_py(py, circle_array_).to_object(py))
}
Type::INTERVAL_ARRAY => {
let interval_array_ = _composite_field_postgres_to_py::<Option<Array<InnerInterval>>>(type_, buf, is_simple)?;
let interval_array_ = _composite_field_postgres_to_py::<Option<Array<InnerInterval>>>(
type_, buf, is_simple,
)?;

Ok(postgres_array_to_py(py, interval_array_).to_object(py))
}
_ => Err(RustPSQLDriverError::RustToPyValueConversionError(
format!("Cannot convert {type_} into Python type, please look at the custom_decoders functionality.")
)),
_ => other_postgres_bytes_to_py(py, type_, buf, is_simple),
}
}

/// Convert OTHER type to python.
///
/// # Errors
/// May return result if type is unknown.
pub fn other_postgres_bytes_to_py(
py: Python<'_>,
type_: &Type,
buf: &mut &[u8],
is_simple: bool,
) -> RustPSQLDriverPyResult<Py<PyAny>> {
if type_.name() == "vector" {
let vector = _composite_field_postgres_to_py::<Option<PgVector>>(type_, buf, is_simple)?;
match vector {
Some(real_vector) => {
return Ok(real_vector.to_vec().to_object(py));
}
None => return Ok(py.None()),
}
}

Err(RustPSQLDriverError::RustToPyValueConversionError(
format!("Cannot convert {type_} into Python type, please look at the custom_decoders functionality.")
))
}

/// Convert composite type from `PostgreSQL` to Python type.
Expand Down
Loading
0