Fix deriving serde and fix annotated usage

Author: AGAEV Denis E

Cargo.lock

@@ -25,6 +25,7 @@ byteorder = "1.5.0"
 chrono = "0.4.33"
 chrono-tz = "0.8.5"
 uuid = { version = "1.7.0", features = ["v4"] }
+serde = { version = "1.0.205", features = ["derive"] }
 serde_json = "1.0.113"
 futures-util = "0.3.30"
 macaddr = "1.0.1"

Cargo.toml

@@ -3,11 +3,12 @@
 from decimal import Decimal
 from enum import Enum
 from ipaddress import IPv4Address
-from typing import Annotated, Any, Dict, List, Tuple, Union
+from typing import Any, Dict, List, Tuple, Union
 
 import pytest
 from pydantic import BaseModel
 from tests.conftest import DefaultPydanticModel, DefaultPythonModelClass
+from typing_extensions import Annotated
 
 from psqlpy import ConnectionPool
 from psqlpy._internal.extra_types import PyCustomType

python/tests/test_value_converter.py

@@ -10,6 +10,7 @@ use pyo3::{
     types::{PyList, PyTuple},
     IntoPy, Py, PyAny, PyObject, Python,
 };
+use serde::{Deserialize, Serialize};
 use tokio_postgres::types::{FromSql, Type};
 
 macro_rules! build_additional_rust_type {
@@ -292,8 +293,7 @@ impl<'a> FromSql<'a> for RustLineSegment {
     }
 }
 
-#[derive(Eq, PartialEq, Clone, Copy, Debug, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Eq, PartialEq, Clone, Copy, Debug, Hash, Serialize, Deserialize)]
 pub struct Line<T: CoordNum = f64> {
     a: T,
     b: T,
@@ -471,7 +471,6 @@ impl<'a> FromSql<'a> for Line {
 // add macro for creating circles
 
 #[derive(Eq, PartialEq, Clone, Copy, Debug, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Circle<T: CoordNum = f64> {
     center: Coord<T>,
     radius: T,