Add values for serialization tests

Author: AGAEV Denis E

python/psqlpy/_internal/extra_types.pyi

@@ -130,16 +130,18 @@ class PyCustomType:
 Coordinates: typing.TypeAlias = typing.Union[
     list[int | float],
     set[int | float],
-    tuple[int | float],
+    tuple[int | float, int | float],
+]
+PairsOfCoordinates: typing.TypeAlias = typing.Union[
+    list[Coordinates | int | float],
+    set[Coordinates | int | float],
+    tuple[Coordinates | int | float, ...],
 ]
 
 class PyPoint:
     """Represent point field in PostgreSQL and Point in Rust."""
 
-    def __init__(
-        self: Self,
-        value: Coordinates,
-    ) -> None:
+    def __init__(self: Self, value: Coordinates) -> None:
         """Create new instance of PyPoint.
 
         It accepts any pair(List, Tuple or Set)
@@ -152,13 +154,7 @@ class PyPoint:
 class PyBox:
     """Represent box field in PostgreSQL and Rect in Rust."""
 
-    def __init__(
-        self: Self,
-        value: typing.Union[
-            typing.Union[list[Coordinates], set[Coordinates], tuple[Coordinates]],
-            Coordinates,
-        ],
-    ) -> None:
+    def __init__(self: Self, value: PairsOfCoordinates) -> None:
         """Create new instance of PyBox.
 
         You need to pass any of this structures:
@@ -174,13 +170,7 @@ class PyBox:
 class PyPath:
     """Represent path field in PostgreSQL and LineString in Rust."""
 
-    def __init__(
-        self: Self,
-        value: typing.Union[
-            typing.Union[list[Coordinates], set[Coordinates], tuple[Coordinates]],
-            Coordinates,
-        ],
-    ) -> None:
+    def __init__(self: Self, value: PairsOfCoordinates) -> None:
         """Create new instance of PyPath.
 
         You need to pass any of this structures:
@@ -196,13 +186,7 @@ class PyPath:
 class PyLine:
     """Represent line field in PostgreSQL and Line in Rust."""
 
-    def __init__(
-        self: Self,
-        value: typing.Union[
-            typing.Union[list[Coordinates], set[Coordinates], tuple[Coordinates]],
-            Coordinates,
-        ],
-    ) -> None:
+    def __init__(self: Self, value: PairsOfCoordinates) -> None:
         """Create new instance of PyLine.
 
         You need to pass any of this structures:
@@ -218,13 +202,7 @@ class PyLine:
 class PyLineSegment:
     """Represent lseg field in PostgreSQL and Line in Rust."""
 
-    def __init__(
-        self: Self,
-        value: typing.Union[
-            typing.Union[list[Coordinates], set[Coordinates], tuple[Coordinates]],
-            Coordinates,
-        ],
-    ) -> None:
+    def __init__(self: Self, value: PairsOfCoordinates) -> None:
         """Create new instance of PyLineSegment.
 
         You need to pass any of this structures:
@@ -240,13 +218,7 @@ class PyLineSegment:
 class PyPolygon:
     """Represent polygon field in PostgreSQL and Polygon in Rust."""
 
-    def __init__(
-        self: Self,
-        value: typing.Union[
-            typing.Union[list[Coordinates], set[Coordinates], tuple[Coordinates]],
-            Coordinates,
-        ],
-    ) -> None:
+    def __init__(self: Self, value: PairsOfCoordinates) -> None:
         """Create new instance of PyPolygon.
 
         You need to pass any of this structures:
@@ -265,18 +237,15 @@ class PyCircle:
     def __init__(
         self: Self,
         value: typing.Union[
-            typing.Union[list[Coordinates], set[Coordinates], tuple[Coordinates]],
-            Coordinates,
+            list[int | float],
+            set[int | float],
+            tuple[int | float, int | float, int | float],
         ],
     ) -> None:
         """Create new instance of PyLine.
 
         You need to pass any of this structures:
-        - sequence of three int/float numbers
-        - sequence of two sequences,
-            each with pair of int/float numbers in every combination
-        - sequence(List, Tuple or Set) with two pairs
-            of int/float numbers in every combination
+        - sequence of three int/float numbers(x, y, r)
 
         ### Parameters:
         - `value`: any valid structure with int/float numbers.

python/tests/test_value_converter.py

@@ -12,8 +12,15 @@
 from psqlpy.extra_types import (
     BigInt,
     Integer,
+    PyBox,
+    PyCircle,
     PyJSON,
     PyJSONB,
+    PyLine,
+    PyLineSegment,
+    PyPath,
+    PyPoint,
+    PyPolygon,
     PyText,
     PyUUID,
     SmallInt,
@@ -111,6 +118,42 @@ async def test_as_class(
             PyJSON([{"array": "json"}, {"one more": "test"}]),
             [{"array": "json"}, {"one more": "test"}],
         ),
+        ("POINT", [1.5, 2], (1.5, 2.0)),
+        ("POINT", PyPoint([1.5, 2]), (1.5, 2.0)),
+        ("POINT", PyPoint({1, 2.3}), (1.0, 2.3)),
+        ("POINT", PyPoint((1.7, 2.8)), (1.7, 2.8)),
+        ("BOX", PyBox([3.5, 3, 9, 9]), ((9.0, 9.0), (3.5, 3.0))),
+        ("BOX", PyBox({[1, 2], [9, 9]}), ((9.0, 9.0), (1.0, 2.0))),
+        ("BOX", PyBox(((1.7, 2.8), (9, 9))), ((9.0, 9.0), (1.7, 2.8))),
+        (
+            "PATH",
+            PyPath([(3.5, 3), (9, 9), (8, 8)]),
+            [(3.5, 3.0), (9.0, 9.0), (8.0, 8.0)],
+        ),
+        (
+            "PATH",
+            PyPath(((1.7, 2.8), (3.3, 2.5), (9, 9), (1.7, 2.8))),
+            ((1.7, 2.8), (3.3, 2.5), (9.0, 9.0), (1.7, 2.8)),
+        ),
+        ("LINE", PyLine({[1, 2], [9, 9]}), [(1.0, 2.0), (9.0, 9.0)]),
+        ("LINE", PyLine(((1.7, 2.8), (9, 9))), [(1.7, 2.8), (9.0, 9.0)]),
+        ("LSEG", PyLineSegment({[1, 2], [9, 9]}), [(1.0, 2.0), (9.0, 9.0)]),
+        ("LSEG", PyLineSegment(((1.7, 2.8), (9, 9))), [(1.7, 2.8), (9.0, 9.0)]),
+        (
+            "POLYGON",
+            PyPolygon((1.7, 2.8, 3.3, 2.5, 9, 9, 1.7, 2.8)),
+            ((1.7, 2.8), (3.3, 2.5), (9.0, 9.0), (1.7, 2.8)),
+        ),
+        (
+            "POLYGON",
+            PyPolygon(((1.7, 2.8), (3.3, 2.5), (9, 9), (1.7, 2.8))),
+            ((1.7, 2.8), (3.3, 2.5), (9.0, 9.0), (1.7, 2.8)),
+        ),
+        (
+            "CIRCLE",
+            PyCircle((1.7, 2.8, 3)),
+            (1.7, 2.8, 3.0),
+        ),
         (
             "VARCHAR ARRAY",
             ["Some String", "Some String"],

src/additional_types.rs

@@ -185,9 +185,9 @@ impl<'a> IntoPy<PyObject> for &'a RustLineString {
         }
 
         if inner_value.is_closed() {
-            return PyList::new_bound(py, result_vec).into();
+            return PyTuple::new_bound(py, result_vec).into();
         }
-        return PyTuple::new_bound(py, result_vec).into();
+        return PyList::new_bound(py, result_vec).into();
     }
 }