Add base geo types

Author: AGAEV Denis E

Cargo.lock

@@ -17,6 +17,7 @@ tokio-postgres = { version = "0.7.10", features = [
     "array-impls",
     "with-chrono-0_4",
     "with-uuid-1",
+    "with-geo-types-0_7",
 ] }
 pyo3-asyncio = { version = "0.19.0", features = ["tokio-runtime"] }
 thiserror = "1.0.56"
@@ -29,3 +30,4 @@ uuid = { version = "1.7.0", features = ["v4"] }
 serde_json = "1.0.113"
 futures-util = "0.3.30"
 macaddr = "1.0.1"
+geo-types = "0.7.13"

Cargo.toml

@@ -0,0 +1,58 @@
+from typing import Sequence, Union
+
+from typing_extensions import Self
+
+class PyPoint:
+    """Represent point field in PostgreSQL and Point in Rust."""
+
+    def __init__(
+        self: Self,
+        value: Sequence[float],
+    ) -> None:
+        """Create new instance of PyPoint.
+
+        It accepts any sequence of two float numbers.
+
+        ### Parameters:
+        - `value`: sequence of two float numbers.
+        """
+
+class PyBox:
+    """Represent box field in PostgreSQL and Rect in Rust."""
+
+    def __init__(
+        self: Self,
+        value: Union[
+            Sequence[Sequence[float]],
+            Sequence[float],
+        ],
+    ) -> None:
+        """Create new instance of PyBox.
+
+        You need to pass any of this structures:
+        - sequence of two sequences, each with two float numbers
+        - sequence of four float
+
+        ### Parameters:
+        - `value`: any valid sequence with four float numbers.
+        """
+
+class PyPath:
+    """Represent path field in PostgreSQL and LineString in Rust."""
+
+    def __init__(
+        self: Self,
+        value: Union[
+            Sequence[Sequence[float]],
+            Sequence[float],
+        ],
+    ) -> None:
+        """Create new instance of PyPath.
+
+        You need to pass any of this structures:
+        - sequence of sequences, each with two float numbers
+        - sequence of float numbers which amount must be a multiple of two
+
+        ### Parameters:
+        - `value`: any valid structure with float numbers.
+        """

python/psqlpy/_internal/geometric_types.pyi

@@ -0,0 +1,12 @@
+from ._internal.geometric_types import (
+    PyPoint,
+    PyBox,
+    PyPath,
+)
+
+
+__all__ = [
+    "PyPoint",
+    "PyBox",
+    "PyPath",
+]

python/psqlpy/geometric_types.py

@@ -0,0 +1,85 @@
+use geo_types::{Point, Rect, LineString};
+use pyo3::{pyclass, pymethods, types::PyModule, PyAny, PyResult, Python};
+
+// use crate::{exceptions::rust_errors::RustPSQLDriverPyResult, value_converter::build_serde_value};
+
+#[pyclass]
+#[derive(Clone)]
+pub struct PyPoint {
+    inner: Point,
+}
+
+impl PyPoint {
+    #[must_use]
+    pub fn inner(&self) -> &Point {
+        &self.inner
+    }
+}
+
+// #[pymethods]
+// impl PyPoint {
+//     #[new]
+//     #[allow(clippy::missing_errors_doc)]
+//     pub fn new_point(value: &PyAny) -> RustPSQLDriverPyResult<Self> {
+//         Ok(Self {
+//             inner: build_serde_value(value)?,
+//         })
+//     }
+// }
+
+#[pyclass]
+#[derive(Clone)]
+pub struct PyBox {
+    inner: Rect,
+}
+
+impl PyBox {
+    #[must_use]
+    pub fn inner(&self) -> &Rect {
+        &self.inner
+    }
+}
+
+// #[pymethods]
+// impl PyBox {
+//     #[new]
+//     #[allow(clippy::missing_errors_doc)]
+//     pub fn new_point(value: &PyAny) -> RustPSQLDriverPyResult<Self> {
+//         Ok(Self {
+//             inner: build_serde_value(value)?,
+//         })
+//     }
+// }
+
+#[pyclass]
+#[derive(Clone)]
+pub struct PyPath {
+    inner: LineString,
+}
+
+impl PyPath {
+    #[must_use]
+    pub fn inner(&self) -> &LineString {
+        &self.inner
+    }
+}
+
+// #[pymethods]
+// impl PyPath {
+//     #[new]
+//     #[allow(clippy::missing_errors_doc)]
+//     pub fn new_point(value: &PyAny) -> RustPSQLDriverPyResult<Self> {
+//         Ok(Self {
+//             inner: build_serde_value(value)?,
+//         })
+//     }
+// }
+
+#[allow(clippy::module_name_repetitions)]
+#[allow(clippy::missing_errors_doc)]
+pub fn geometric_types_module(_py: Python<'_>, pymod: &PyModule) -> PyResult<()> {
+    pymod.add_class::<PyPoint>()?;
+    pymod.add_class::<PyBox>()?;
+    pymod.add_class::<PyPath>()?;
+    Ok(())
+}

src/geometric_types.rs

@@ -7,6 +7,7 @@ pub mod query_result;
 pub mod value_converter;
 
 use common::add_module;
+use geometric_types::geometric_types_module;
 use exceptions::python_errors::python_exceptions_module;
 use extra_types::extra_types_module;
 use pyo3::{pymodule, types::PyModule, PyResult, Python};
@@ -23,6 +24,7 @@ fn psqlpy(py: Python<'_>, pymod: &PyModule) -> PyResult<()> {
     pymod.add_class::<driver::common_options::ConnRecyclingMethod>()?;
     pymod.add_class::<query_result::PSQLDriverPyQueryResult>()?;
     add_module(py, pymod, "extra_types", extra_types_module)?;
+    add_module(py, pymod, "geometric_types", geometric_types_module)?;
     add_module(py, pymod, "exceptions", python_exceptions_module)?;
     Ok(())
 }