database-wrapper 0.1.86__py3-none-any.whl → 0.1.88__py3-none-any.whl

database_wrapper/config.py

@@ -3,7 +3,7 @@ from typing import Any
 CONFIG: dict[str, Any] = {
     # These are supposed to be set automatically by a git pre-compile script
     # They are one git commit hash behind, if used automatically
-    "git_commit_hash": "b117e5a27fe8408b8245baae74eda5aefdcce995",
-    "git_commit_date": "25.04.2025 21:32",
-    "app_version": "0.1.86",
+    "git_commit_hash": "3b140044c9c3f01102ec24e8739906b577491571",
+    "git_commit_date": "19.06.2025 12:03",
+    "app_version": "0.1.88",
 }

database_wrapper/db_backend.py

@@ -90,9 +90,7 @@ class DatabaseBackend:
         self.cursor = None
         self.shutdownRequested = Event()
         self.contextConnection = ContextVar(f"db_connection_{self.name}", default=None)
-        self.contextConnectionAsync = ContextVar(
-            f"db_connection_{self.name}_async", default=None
-        )
+        self.contextConnectionAsync = ContextVar(f"db_connection_{self.name}_async", default=None)
 
     def __del__(self) -> None:
         """What to do when class is destroyed"""
@@ -147,14 +145,22 @@ class DatabaseBackend:
 
     def close(self) -> Any:
         """Close connections"""
-        if self.cursor:
-            self.logger.debug("Closing cursor")
-            self.cursor.close()
+        try:
+            if self.cursor:
+                self.logger.debug("Closing cursor")
+                self.cursor.close()
+        except Exception as e:
+            self.logger.debug(f"Error while closing cursor: {e}")
+        finally:
             self.cursor = None
 
-        if self.connection:
-            self.logger.debug("Closing connection")
-            self.connection.close()
+        try:
+            if self.connection:
+                self.logger.debug("Closing connection")
+                self.connection.close()
+        except Exception as e:
+            self.logger.debug(f"Error while closing connection: {e}")
+        finally:
             self.connection = None
 
     def newConnection(self) -> Any:
@@ -227,9 +233,7 @@ class DatabaseBackend:
         s.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPCNT, 3)
         # To set timeout for an RTO you must set TCP_USER_TIMEOUT timeout
         # (in milliseconds) for socket.
-        s.setsockopt(
-            socket.IPPROTO_TCP, socket.TCP_USER_TIMEOUT, self.connectionTimeout * 1000
-        )
+        s.setsockopt(socket.IPPROTO_TCP, socket.TCP_USER_TIMEOUT, self.connectionTimeout * 1000)
 
     ####################
     ### Transactions ###

database_wrapper/db_data_model.py

@@ -25,6 +25,7 @@ class MetadataDict(TypedDict):
     serialize: NotRequired[Callable[[Any], Any] | SerializeType | None]
     deserialize: NotRequired[Callable[[Any], Any] | None]
     enum_class: NotRequired[Type[Enum] | None]
+    timezone: NotRequired[str | datetime.tzinfo | None]
 
 
 @dataclass
@@ -137,8 +138,9 @@ class DBDataModel:
             # Here we actually need to deserialize the value to correct class type
             serialize = metadata.get("serialize", None)
             enumClass = metadata.get("enum_class", None)
+            timezone = metadata.get("timezone", None)
             if serialize is not None and isinstance(serialize, SerializeType):
-                value = deserializeValue(value, serialize, enumClass)
+                value = deserializeValue(value, serialize, enumClass, timezone)
                 setattr(self, fieldName, value)
 
             else:

database_wrapper/serialization.py

@@ -4,6 +4,7 @@ import json
 from decimal import Decimal
 from enum import Enum
 from typing import Any, Type
+from zoneinfo import ZoneInfo
 
 
 class SerializeType(Enum):
@@ -47,6 +48,7 @@ def deserializeValue(
     value: Any,
     sType: SerializeType,
     enumClass: Type[Enum] | None = None,
+    timezone: str | datetime.tzinfo | None = None,
 ) -> Any:
     if sType == SerializeType.DATETIME:
         if isinstance(value, datetime.datetime):
@@ -57,7 +59,11 @@ def deserializeValue(
             timestamp = float(value)
             if timestamp > 1e10:  # Check if timestamp is in milliseconds
                 timestamp /= 1000
-            return datetime.datetime.fromtimestamp(timestamp)
+
+            if timezone is not None and isinstance(timezone, str):
+                timezone = ZoneInfo(timezone)
+
+            return datetime.datetime.fromtimestamp(timestamp, tz=timezone)
 
         return datetime.datetime.fromisoformat(value)
 

{database_wrapper-0.1.86.dist-info → database_wrapper-0.1.88.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: database_wrapper
-Version: 0.1.86
+Version: 0.1.88
 Summary: A Different Approach to Database Wrappers in Python
 Author-email: Gints Murans <gm@gm.lv>
 License: GNU General Public License v3.0 (GPL-3.0)
@@ -33,13 +33,13 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Provides-Extra: pgsql
-Requires-Dist: database_wrapper_pgsql==0.1.86; extra == "pgsql"
+Requires-Dist: database_wrapper_pgsql==0.1.88; extra == "pgsql"
 Provides-Extra: mysql
-Requires-Dist: database_wrapper_mysql==0.1.86; extra == "mysql"
+Requires-Dist: database_wrapper_mysql==0.1.88; extra == "mysql"
 Provides-Extra: mssql
-Requires-Dist: database_wrapper_mssql==0.1.86; extra == "mssql"
+Requires-Dist: database_wrapper_mssql==0.1.88; extra == "mssql"
 Provides-Extra: sqlite
-Requires-Dist: database_wrapper_sqlite==0.1.86; extra == "sqlite"
+Requires-Dist: database_wrapper_sqlite==0.1.88; extra == "sqlite"
 Provides-Extra: all
 Requires-Dist: database_wrapper[mssql,mysql,pgsql,sqlite]; extra == "all"
 Provides-Extra: dev

{database_wrapper-0.1.86.dist-info → database_wrapper-0.1.88.dist-info}/RECORD

@@ -1,17 +1,17 @@
 database_wrapper/__init__.py,sha256=p-HLz9_zByIUeAS1tVxS7ZieslsryHSLw_IKZphqB7w,1200
 database_wrapper/abc.py,sha256=JiQo6Yfv7xALrrHeICJCSgmyP2gHrp16Ov83mPBTGbE,2058
 database_wrapper/common.py,sha256=fsxe28o_4xCrotPbB274dmzQ9rOyes0sBtcHog-9RVc,258
-database_wrapper/config.py,sha256=kWelGxk53aaNirxNWNFJXhT9O7zKOMM9avqAeKIe4Tw,334
-database_wrapper/db_backend.py,sha256=cMpUj-GOcrr-wVFG2ztKyTd65u50R0kmQ71Lx6GXgd0,7866
-database_wrapper/db_data_model.py,sha256=3NcxWr6Sk_Ixx1QPLWZfJLwxVqN391IZ1_K4WZMNJRE,14181
+database_wrapper/config.py,sha256=yL9l-63BC2G4E8AX3ydpkFx3vAYgp-6_cp7mFlV5TyI,334
+database_wrapper/db_backend.py,sha256=yfJHdEULvKx_hU_yUfm7C-1H6VYlh_LLlhkvKw_ZGQs,8104
+database_wrapper/db_data_model.py,sha256=EDYmmmus7L7VMBi4aTCT9EoB0V0PXaOBVX-v5NG90PA,14301
 database_wrapper/db_wrapper.py,sha256=nsFHax43Zz8L3sBih9kVlnAvZWC2hv9U7V_MICbE0RY,14353
 database_wrapper/db_wrapper_async.py,sha256=8D4Oa0F6uPdjpH-cvmUPXLmbz35NLA7oa2MShIPourc,14737
 database_wrapper/db_wrapper_mixin.py,sha256=GR6Zn-2GygzzSaFWPIqkiI6mZ8oWqKY_Sc-MeUp6SG8,9966
 database_wrapper/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-database_wrapper/serialization.py,sha256=McLVLRlJ60OI2xHwnKD-0d3qHb5U8KTpz1P19SphxL8,2068
+database_wrapper/serialization.py,sha256=6lW_q1BKdZpRfi6PEbnBh-kYcLMFFrdxpRHgT8WZG34,2277
 database_wrapper/utils/__init__.py,sha256=uC8YaJqfyFIZIeNdTRTbZwcOUVhmnS5eyOG-9gMs70c,96
 database_wrapper/utils/dataclass_addons.py,sha256=r8DD40tXA_DLMQJx62UqVaRe4Gr9BSOmChLRhxawet4,770
-database_wrapper-0.1.86.dist-info/METADATA,sha256=V4VLeqJRAQojIJa6kPfqNHOs9k5C9Db_mrzpluJAH_M,3440
-database_wrapper-0.1.86.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-database_wrapper-0.1.86.dist-info/top_level.txt,sha256=QcnS4ocJygxcKE5eoOqriuja306oVu-zJRn6yjRRhBw,17
-database_wrapper-0.1.86.dist-info/RECORD,,
+database_wrapper-0.1.88.dist-info/METADATA,sha256=sRPgbbeqvtQDaRtne2JRYwt43hrR7oARbtNFlJ-6_7s,3440
+database_wrapper-0.1.88.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+database_wrapper-0.1.88.dist-info/top_level.txt,sha256=QcnS4ocJygxcKE5eoOqriuja306oVu-zJRn6yjRRhBw,17
+database_wrapper-0.1.88.dist-info/RECORD,,

{database_wrapper-0.1.86.dist-info → database_wrapper-0.1.88.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any