From 3b605782e38aa854f1dc27bf8d188c26eed01d15 Mon Sep 17 00:00:00 2001
From: Rahul Yadav <rahulyadavsep92@gmail.com>
Date: Tue, 19 Dec 2023 05:49:32 +0000
Subject: [PATCH 1/3] feat(spanner): add support of float32 type

---
 google/cloud/spanner_v1/types/type.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/google/cloud/spanner_v1/types/type.py b/google/cloud/spanner_v1/types/type.py
index f25c465dd4..d9b6b9def5 100644
--- a/google/cloud/spanner_v1/types/type.py
+++ b/google/cloud/spanner_v1/types/type.py
@@ -50,6 +50,9 @@ class TypeCode(proto.Enum):
         FLOAT64 (3):
             Encoded as ``number``, or the strings ``"NaN"``,
             ``"Infinity"``, or ``"-Infinity"``.
+        FLOAT32 (15):
+            Encoded as TBD (``number`` or ``string``), or the strings
+            ``"NaN"``, ``"Infinity"``, or ``"-Infinity"``.
         TIMESTAMP (4):
             Encoded as ``string`` in RFC 3339 timestamp format. The time
             zone must be present, and must be ``"Z"``.
@@ -99,6 +102,7 @@ class TypeCode(proto.Enum):
     BOOL = 1
     INT64 = 2
     FLOAT64 = 3
+    FLOAT32 = 15
     TIMESTAMP = 4
     DATE = 5
     STRING = 6

From 026c1bb2501e3205b8949a926e8a69616bbc2e45 Mon Sep 17 00:00:00 2001
From: rahul yadav <rahulyadavsep92@gmail.com>
Date: Wed, 20 Dec 2023 11:45:12 +0530
Subject: [PATCH 2/3] add float32 support

---
 google/cloud/spanner_dbapi/parse_utils.py |  2 +
 google/cloud/spanner_v1/_helpers.py       | 17 ++++-
 google/cloud/spanner_v1/param_types.py    |  1 +
 tests/_fixtures.py                        |  2 +
 tests/system/test_session_api.py          | 76 +++++++++++++++++------
 tests/system/test_table_api.py            |  1 +
 6 files changed, 80 insertions(+), 19 deletions(-)

diff --git a/google/cloud/spanner_dbapi/parse_utils.py b/google/cloud/spanner_dbapi/parse_utils.py
index 76ac951e0c..123e267914 100644
--- a/google/cloud/spanner_dbapi/parse_utils.py
+++ b/google/cloud/spanner_dbapi/parse_utils.py
@@ -18,6 +18,7 @@
 import decimal
 import re
 
+import numpy
 import sqlparse
 from google.cloud import spanner_v1 as spanner
 from google.cloud.spanner_v1 import JsonObject
@@ -36,6 +37,7 @@
     str: spanner.param_types.STRING,
     int: spanner.param_types.INT64,
     float: spanner.param_types.FLOAT64,
+    numpy.float32: spanner.param_types.Float32,
     datetime.datetime: spanner.param_types.TIMESTAMP,
     datetime.date: spanner.param_types.DATE,
     DateStr: spanner.param_types.DATE,
diff --git a/google/cloud/spanner_v1/_helpers.py b/google/cloud/spanner_v1/_helpers.py
index e0e2bfdbd0..3b80cfe6d3 100644
--- a/google/cloud/spanner_v1/_helpers.py
+++ b/google/cloud/spanner_v1/_helpers.py
@@ -19,6 +19,7 @@
 import math
 import time
 
+import numpy
 from google.protobuf.struct_pb2 import ListValue
 from google.protobuf.struct_pb2 import Value
 
@@ -134,7 +135,7 @@ def _make_value_pb(value):
     """
     if value is None:
         return Value(null_value="NULL_VALUE")
-    if isinstance(value, (list, tuple)):
+    if isinstance(value, (list, tuple, numpy.ndarray)):
         return Value(list_value=_make_list_value_pb(value))
     if isinstance(value, bool):
         return Value(bool_value=value)
@@ -149,6 +150,15 @@ def _make_value_pb(value):
             else:
                 return Value(string_value="-Infinity")
         return Value(number_value=value)
+    if isinstance(value, numpy.float32):
+        if numpy.isnan(value):
+            return Value(string_value="NaN")
+        if numpy.isinf(value):
+            if value > 0:
+                return Value(string_value="Infinity")
+            else:
+                return Value(string_value="-Infinity")
+        return Value(number_value=value)
     if isinstance(value, datetime_helpers.DatetimeWithNanoseconds):
         return Value(string_value=value.rfc3339())
     if isinstance(value, datetime.datetime):
@@ -228,6 +238,11 @@ def _parse_value_pb(value_pb, field_type):
             return float(value_pb.string_value)
         else:
             return value_pb.number_value
+    elif  type_code == TypeCode.FLOAT32:
+        if value_pb.HasField("string_value"):
+            return numpy.float32(value_pb.string_value)
+        else:
+            return value_pb.number_value
     elif type_code == TypeCode.DATE:
         return _date_from_iso8601_date(value_pb.string_value)
     elif type_code == TypeCode.TIMESTAMP:
diff --git a/google/cloud/spanner_v1/param_types.py b/google/cloud/spanner_v1/param_types.py
index 0c03f7ecc6..6bceac1ab5 100644
--- a/google/cloud/spanner_v1/param_types.py
+++ b/google/cloud/spanner_v1/param_types.py
@@ -26,6 +26,7 @@
 BOOL = Type(code=TypeCode.BOOL)
 INT64 = Type(code=TypeCode.INT64)
 FLOAT64 = Type(code=TypeCode.FLOAT64)
+Float32 = Type(code=TypeCode.FLOAT32)
 DATE = Type(code=TypeCode.DATE)
 TIMESTAMP = Type(code=TypeCode.TIMESTAMP)
 NUMERIC = Type(code=TypeCode.NUMERIC)
diff --git a/tests/_fixtures.py b/tests/_fixtures.py
index b6f4108490..8b8e11da19 100644
--- a/tests/_fixtures.py
+++ b/tests/_fixtures.py
@@ -40,6 +40,8 @@
     date_array ARRAY<DATE>,
     float_value FLOAT64,
     float_array ARRAY<FLOAT64>,
+    float32_value FLOAT32,
+    float32_array ARRAY<FLOAT32>,    
     string_value STRING(16),
     string_array ARRAY<STRING(16)>,
     timestamp_value TIMESTAMP,
diff --git a/tests/system/test_session_api.py b/tests/system/test_session_api.py
index 30981322cc..47cf292166 100644
--- a/tests/system/test_session_api.py
+++ b/tests/system/test_session_api.py
@@ -20,6 +20,7 @@
 import threading
 import time
 import pytest
+import numpy
 
 import grpc
 from google.rpc import code_pb2
@@ -39,6 +40,8 @@
 NANO_TIME = datetime_helpers.DatetimeWithNanoseconds(1995, 8, 31, nanosecond=987654321)
 POS_INF = float("+inf")
 NEG_INF = float("-inf")
+NUMPY_POS_INF = numpy.float32("+inf")
+NUMPY_NEG_INF = numpy.float32("-inf")
 (OTHER_NAN,) = struct.unpack("<d", b"\x01\x00\x01\x00\x00\x00\xf8\xff")
 BYTES_1 = b"Ymlu"
 BYTES_2 = b"Ym9vdHM="
@@ -81,6 +84,8 @@
     "numeric_array",
     "json_value",
     "json_array",
+    "float32_value",
+    "float32_array",
 )
 
 EMULATOR_ALL_TYPES_COLUMNS = LIVE_ALL_TYPES_COLUMNS[:-4]
@@ -113,35 +118,44 @@
     AllTypesRowData(pkey=102, bool_value=False),
     AllTypesRowData(pkey=103, bytes_value=BYTES_1),
     AllTypesRowData(pkey=104, date_value=SOME_DATE),
-    AllTypesRowData(pkey=105, float_value=1.4142136),
-    AllTypesRowData(pkey=106, string_value="VALUE"),
-    AllTypesRowData(pkey=107, timestamp_value=SOME_TIME),
-    AllTypesRowData(pkey=108, timestamp_value=NANO_TIME),
-    AllTypesRowData(pkey=109, numeric_value=NUMERIC_1),
-    AllTypesRowData(pkey=110, json_value=JSON_1),
-    AllTypesRowData(pkey=111, json_value=JsonObject([JSON_1, JSON_2])),
+    AllTypesRowData(pkey=105, float32_value=1.414213),
+    AllTypesRowData(pkey=106, float32_value=numpy.float32(1.414213)),
+    AllTypesRowData(pkey=107, float_value=1.4142136),
+    AllTypesRowData(pkey=108, string_value="VALUE"),
+    AllTypesRowData(pkey=109, timestamp_value=SOME_TIME),
+    AllTypesRowData(pkey=110, timestamp_value=NANO_TIME),
+    AllTypesRowData(pkey=111, numeric_value=NUMERIC_1),
+    AllTypesRowData(pkey=112, json_value=JSON_1),
+    AllTypesRowData(pkey=113, json_value=JsonObject([JSON_1, JSON_2])),
     # empty array values
     AllTypesRowData(pkey=201, int_array=[]),
     AllTypesRowData(pkey=202, bool_array=[]),
     AllTypesRowData(pkey=203, bytes_array=[]),
     AllTypesRowData(pkey=204, date_array=[]),
     AllTypesRowData(pkey=205, float_array=[]),
-    AllTypesRowData(pkey=206, string_array=[]),
-    AllTypesRowData(pkey=207, timestamp_array=[]),
-    AllTypesRowData(pkey=208, numeric_array=[]),
-    AllTypesRowData(pkey=209, json_array=[]),
+    AllTypesRowData(pkey=206, float32_array=[]),
+    AllTypesRowData(pkey=207, string_array=[]),
+    AllTypesRowData(pkey=208, timestamp_array=[]),
+    AllTypesRowData(pkey=209, numeric_array=[]),
+    AllTypesRowData(pkey=210, json_array=[]),
     # non-empty array values, including nulls
     AllTypesRowData(pkey=301, int_array=[123, 456, None]),
     AllTypesRowData(pkey=302, bool_array=[True, False, None]),
     AllTypesRowData(pkey=303, bytes_array=[BYTES_1, BYTES_2, None]),
     AllTypesRowData(pkey=304, date_array=[SOME_DATE, None]),
     AllTypesRowData(
-        pkey=305, float_array=[3.1415926, 2.71828, math.inf, -math.inf, None]
+        pkey=305, float32_array=[3.1415926, 2.71828, math.inf, -math.inf, None]
     ),
-    AllTypesRowData(pkey=306, string_array=["One", "Two", None]),
-    AllTypesRowData(pkey=307, timestamp_array=[SOME_TIME, NANO_TIME, None]),
-    AllTypesRowData(pkey=308, numeric_array=[NUMERIC_1, NUMERIC_2, None]),
-    AllTypesRowData(pkey=309, json_array=[JSON_1, JSON_2, None]),
+    AllTypesRowData(
+        pkey=306, float32_array=numpy.array([3.14159, 2.71828, math.inf,-math.inf, None], dtype=numpy.float32)
+    ),
+    AllTypesRowData(
+        pkey=307, float_array=[3.1415926, 2.71828, math.inf, -math.inf, None]
+    ),
+    AllTypesRowData(pkey=308, string_array=["One", "Two", None]),
+    AllTypesRowData(pkey=309, timestamp_array=[SOME_TIME, NANO_TIME, None]),
+    AllTypesRowData(pkey=310, numeric_array=[NUMERIC_1, NUMERIC_2, None]),
+    AllTypesRowData(pkey=311, json_array=[JSON_1, JSON_2, None]),
 )
 EMULATOR_ALL_TYPES_ROWDATA = (
     # all nulls
@@ -2152,7 +2166,7 @@ def test_execute_sql_w_float_bindings_transfinite(sessions_database, database_di
         sessions_database,
         sql=f"SELECT {placeholder}",
         params={key: NEG_INF},
-        param_types={key: spanner_v1.param_types.FLOAT64},
+        param_types={key: spanner_v1.param_types.Float32},
         expected=[(NEG_INF,)],
         order=False,
     )
@@ -2164,11 +2178,37 @@ def test_execute_sql_w_float_bindings_transfinite(sessions_database, database_di
         sessions_database,
         sql=f"SELECT {placeholder}",
         params={key: POS_INF},
-        param_types={key: spanner_v1.param_types.FLOAT64},
+        param_types={key: spanner_v1.param_types.Float32},
         expected=[(POS_INF,)],
         order=False,
     )
 
+def test_execute_sql_w_float32_bindings_transfinite(sessions_database, database_dialect):
+    key = "p1" if database_dialect == DatabaseDialect.POSTGRESQL else "neg_inf"
+    placeholder = "$1" if database_dialect == DatabaseDialect.POSTGRESQL else f"@{key}"
+
+    # Find -inf
+    _check_sql_results(
+        sessions_database,
+        sql=f"SELECT {placeholder}",
+        params={key: NUMPY_NEG_INF},
+        param_types={key: spanner_v1.param_types.Float32},
+        expected=[(NUMPY_NEG_INF,)],
+        order=False,
+    )
+
+    key = "p1" if database_dialect == DatabaseDialect.POSTGRESQL else "pos_inf"
+    placeholder = "$1" if database_dialect == DatabaseDialect.POSTGRESQL else f"@{key}"
+    # Find +inf
+    _check_sql_results(
+        sessions_database,
+        sql=f"SELECT {placeholder}",
+        params={key: NUMPY_POS_INF},
+        param_types={key: spanner_v1.param_types.Float32},
+        expected=[(NUMPY_POS_INF,)],
+        order=False,
+    )
+
 
 def test_execute_sql_w_bytes_bindings(sessions_database, database_dialect):
     _bind_test_helper(
diff --git a/tests/system/test_table_api.py b/tests/system/test_table_api.py
index 7d4da2b363..f2624eeb2c 100644
--- a/tests/system/test_table_api.py
+++ b/tests/system/test_table_api.py
@@ -69,6 +69,7 @@ def test_table_schema(shared_database, database_dialect):
         ("bool_value", spanner_v1.TypeCode.BOOL),
         ("bytes_value", spanner_v1.TypeCode.BYTES),
         ("float_value", spanner_v1.TypeCode.FLOAT64),
+        ("float32_value", spanner_v1.TypeCode.FLOAT32),
         ("string_value", spanner_v1.TypeCode.STRING),
         ("timestamp_value", spanner_v1.TypeCode.TIMESTAMP),
         ("date_value", spanner_v1.TypeCode.DATE),

From 47404b8669a4a4999b197dbc89a5f34a4aa75d74 Mon Sep 17 00:00:00 2001
From: rahul yadav <rahulyadavsep92@gmail.com>
Date: Sun, 7 Jan 2024 13:05:15 +0530
Subject: [PATCH 3/3] remove numpy support

---
 google/cloud/spanner_dbapi/parse_utils.py |  2 -
 google/cloud/spanner_v1/_helpers.py       | 14 +-----
 tests/system/test_session_api.py          | 61 ++++++++---------------
 3 files changed, 23 insertions(+), 54 deletions(-)

diff --git a/google/cloud/spanner_dbapi/parse_utils.py b/google/cloud/spanner_dbapi/parse_utils.py
index 123e267914..76ac951e0c 100644
--- a/google/cloud/spanner_dbapi/parse_utils.py
+++ b/google/cloud/spanner_dbapi/parse_utils.py
@@ -18,7 +18,6 @@
 import decimal
 import re
 
-import numpy
 import sqlparse
 from google.cloud import spanner_v1 as spanner
 from google.cloud.spanner_v1 import JsonObject
@@ -37,7 +36,6 @@
     str: spanner.param_types.STRING,
     int: spanner.param_types.INT64,
     float: spanner.param_types.FLOAT64,
-    numpy.float32: spanner.param_types.Float32,
     datetime.datetime: spanner.param_types.TIMESTAMP,
     datetime.date: spanner.param_types.DATE,
     DateStr: spanner.param_types.DATE,
diff --git a/google/cloud/spanner_v1/_helpers.py b/google/cloud/spanner_v1/_helpers.py
index 3b80cfe6d3..c26b876461 100644
--- a/google/cloud/spanner_v1/_helpers.py
+++ b/google/cloud/spanner_v1/_helpers.py
@@ -19,7 +19,6 @@
 import math
 import time
 
-import numpy
 from google.protobuf.struct_pb2 import ListValue
 from google.protobuf.struct_pb2 import Value
 
@@ -135,8 +134,6 @@ def _make_value_pb(value):
     """
     if value is None:
         return Value(null_value="NULL_VALUE")
-    if isinstance(value, (list, tuple, numpy.ndarray)):
-        return Value(list_value=_make_list_value_pb(value))
     if isinstance(value, bool):
         return Value(bool_value=value)
     if isinstance(value, int):
@@ -150,15 +147,6 @@ def _make_value_pb(value):
             else:
                 return Value(string_value="-Infinity")
         return Value(number_value=value)
-    if isinstance(value, numpy.float32):
-        if numpy.isnan(value):
-            return Value(string_value="NaN")
-        if numpy.isinf(value):
-            if value > 0:
-                return Value(string_value="Infinity")
-            else:
-                return Value(string_value="-Infinity")
-        return Value(number_value=value)
     if isinstance(value, datetime_helpers.DatetimeWithNanoseconds):
         return Value(string_value=value.rfc3339())
     if isinstance(value, datetime.datetime):
@@ -240,7 +228,7 @@ def _parse_value_pb(value_pb, field_type):
             return value_pb.number_value
     elif  type_code == TypeCode.FLOAT32:
         if value_pb.HasField("string_value"):
-            return numpy.float32(value_pb.string_value)
+            return float(value_pb.string_value)
         else:
             return value_pb.number_value
     elif type_code == TypeCode.DATE:
diff --git a/tests/system/test_session_api.py b/tests/system/test_session_api.py
index 47cf292166..04f70bf0f5 100644
--- a/tests/system/test_session_api.py
+++ b/tests/system/test_session_api.py
@@ -40,8 +40,6 @@
 NANO_TIME = datetime_helpers.DatetimeWithNanoseconds(1995, 8, 31, nanosecond=987654321)
 POS_INF = float("+inf")
 NEG_INF = float("-inf")
-NUMPY_POS_INF = numpy.float32("+inf")
-NUMPY_NEG_INF = numpy.float32("-inf")
 (OTHER_NAN,) = struct.unpack("<d", b"\x01\x00\x01\x00\x00\x00\xf8\xff")
 BYTES_1 = b"Ymlu"
 BYTES_2 = b"Ym9vdHM="
@@ -119,14 +117,13 @@
     AllTypesRowData(pkey=103, bytes_value=BYTES_1),
     AllTypesRowData(pkey=104, date_value=SOME_DATE),
     AllTypesRowData(pkey=105, float32_value=1.414213),
-    AllTypesRowData(pkey=106, float32_value=numpy.float32(1.414213)),
-    AllTypesRowData(pkey=107, float_value=1.4142136),
-    AllTypesRowData(pkey=108, string_value="VALUE"),
-    AllTypesRowData(pkey=109, timestamp_value=SOME_TIME),
-    AllTypesRowData(pkey=110, timestamp_value=NANO_TIME),
-    AllTypesRowData(pkey=111, numeric_value=NUMERIC_1),
-    AllTypesRowData(pkey=112, json_value=JSON_1),
-    AllTypesRowData(pkey=113, json_value=JsonObject([JSON_1, JSON_2])),
+    AllTypesRowData(pkey=106, float_value=1.4142136),
+    AllTypesRowData(pkey=107, string_value="VALUE"),
+    AllTypesRowData(pkey=108, timestamp_value=SOME_TIME),
+    AllTypesRowData(pkey=109, timestamp_value=NANO_TIME),
+    AllTypesRowData(pkey=110, numeric_value=NUMERIC_1),
+    AllTypesRowData(pkey=111, json_value=JSON_1),
+    AllTypesRowData(pkey=112, json_value=JsonObject([JSON_1, JSON_2])),
     # empty array values
     AllTypesRowData(pkey=201, int_array=[]),
     AllTypesRowData(pkey=202, bool_array=[]),
@@ -147,15 +144,12 @@
         pkey=305, float32_array=[3.1415926, 2.71828, math.inf, -math.inf, None]
     ),
     AllTypesRowData(
-        pkey=306, float32_array=numpy.array([3.14159, 2.71828, math.inf,-math.inf, None], dtype=numpy.float32)
+        pkey=306, float_array=[3.1415926, 2.71828, math.inf, -math.inf, None]
     ),
-    AllTypesRowData(
-        pkey=307, float_array=[3.1415926, 2.71828, math.inf, -math.inf, None]
-    ),
-    AllTypesRowData(pkey=308, string_array=["One", "Two", None]),
-    AllTypesRowData(pkey=309, timestamp_array=[SOME_TIME, NANO_TIME, None]),
-    AllTypesRowData(pkey=310, numeric_array=[NUMERIC_1, NUMERIC_2, None]),
-    AllTypesRowData(pkey=311, json_array=[JSON_1, JSON_2, None]),
+    AllTypesRowData(pkey=307, string_array=["One", "Two", None]),
+    AllTypesRowData(pkey=308, timestamp_array=[SOME_TIME, NANO_TIME, None]),
+    AllTypesRowData(pkey=309, numeric_array=[NUMERIC_1, NUMERIC_2, None]),
+    AllTypesRowData(pkey=310, json_array=[JSON_1, JSON_2, None]),
 )
 EMULATOR_ALL_TYPES_ROWDATA = (
     # all nulls
@@ -2166,50 +2160,39 @@ def test_execute_sql_w_float_bindings_transfinite(sessions_database, database_di
         sessions_database,
         sql=f"SELECT {placeholder}",
         params={key: NEG_INF},
-        param_types={key: spanner_v1.param_types.Float32},
+        param_types={key: spanner_v1.param_types.FLOAT64},
         expected=[(NEG_INF,)],
         order=False,
     )
-
-    key = "p1" if database_dialect == DatabaseDialect.POSTGRESQL else "pos_inf"
-    placeholder = "$1" if database_dialect == DatabaseDialect.POSTGRESQL else f"@{key}"
-    # Find +inf
     _check_sql_results(
         sessions_database,
         sql=f"SELECT {placeholder}",
-        params={key: POS_INF},
+        params={key: NEG_INF},
         param_types={key: spanner_v1.param_types.Float32},
-        expected=[(POS_INF,)],
+        expected=[(NEG_INF,)],
         order=False,
     )
 
-def test_execute_sql_w_float32_bindings_transfinite(sessions_database, database_dialect):
-    key = "p1" if database_dialect == DatabaseDialect.POSTGRESQL else "neg_inf"
+    key = "p1" if database_dialect == DatabaseDialect.POSTGRESQL else "pos_inf"
     placeholder = "$1" if database_dialect == DatabaseDialect.POSTGRESQL else f"@{key}"
-
-    # Find -inf
+    # Find +inf
     _check_sql_results(
         sessions_database,
         sql=f"SELECT {placeholder}",
-        params={key: NUMPY_NEG_INF},
-        param_types={key: spanner_v1.param_types.Float32},
-        expected=[(NUMPY_NEG_INF,)],
+        params={key: POS_INF},
+        param_types={key: spanner_v1.param_types.FLOAT64},
+        expected=[(POS_INF,)],
         order=False,
     )
-
-    key = "p1" if database_dialect == DatabaseDialect.POSTGRESQL else "pos_inf"
-    placeholder = "$1" if database_dialect == DatabaseDialect.POSTGRESQL else f"@{key}"
-    # Find +inf
     _check_sql_results(
         sessions_database,
         sql=f"SELECT {placeholder}",
-        params={key: NUMPY_POS_INF},
+        params={key: POS_INF},
         param_types={key: spanner_v1.param_types.Float32},
-        expected=[(NUMPY_POS_INF,)],
+        expected=[(POS_INF,)],
         order=False,
     )
 
-
 def test_execute_sql_w_bytes_bindings(sessions_database, database_dialect):
     _bind_test_helper(
         sessions_database,