e6data-python-connector 2.1.17__tar.gz → 2.1.19__tar.gz

{e6data-python-connector-2.1.17/e6data_python_connector.egg-info → e6data_python_connector-2.1.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e6data-python-connector
-Version: 2.1.17
+Version: 2.1.19
 Summary: Client for the e6data distributed SQL Engine.
 Home-page: https://github.com/e6x-labs/e6data-python-connector
 Author: Uniphi, Inc.
@@ -27,7 +27,7 @@ Requires-Dist: sqlalchemy
 
 # e6data Python Connector
 
-![version](https://img.shields.io/badge/version-2.1.17-blue.svg)
+![version](https://img.shields.io/badge/version-2.1.19-blue.svg)
 
 ## Introduction
 

{e6data-python-connector-2.1.17 → e6data_python_connector-2.1.19}/README.md

@@ -1,6 +1,6 @@
 # e6data Python Connector
 
-![version](https://img.shields.io/badge/version-2.1.17-blue.svg)
+![version](https://img.shields.io/badge/version-2.1.19-blue.svg)
 
 ## Introduction
 

{e6data-python-connector-2.1.17 → e6data_python_connector-2.1.19}/e6data_python_connector/datainputstream.py

@@ -8,7 +8,7 @@ from thrift.transport import TTransport
 
 from e6data_python_connector.e6x_vector.ttypes import Chunk, Vector, VectorType
 from e6data_python_connector.constants import ZONE
-from e6data_python_connector.date_time_utils import floor_div, floor_mod, get_zone
+from e6data_python_connector.date_time_utils import floor_div, floor_mod, timezone_from_offset
 
 try:
     from thrift.protocol import fastbinary
@@ -201,10 +201,11 @@ def read_rows_from_chunk(query_columns_description: list, buffer):
     return rows
 
 
+
 def get_column_from_chunk(vector: Vector) -> list:
     value_array = list()
     d_type = vector.vectorType
-    zone = 'UTC'
+    zone = pytz.UTC
     try:
         if d_type == VectorType.LONG:
             for row in range(vector.size):
@@ -221,8 +222,7 @@ def get_column_from_chunk(vector: Vector) -> list:
                 epoch_seconds = floor_div(vector.data.dateData.data[
                                               row] if not vector.isConstantVector else vector.data.dateConstantData.data,
                                           1000_000)
-                zone_offset = pytz.timezone(zone)
-                date = datetime.fromtimestamp(epoch_seconds, zone_offset)
+                date = datetime.fromtimestamp(epoch_seconds, zone)
                 value_array.append(date.strftime("%Y-%m-%d"))
         elif d_type == VectorType.DATETIME:
             for row in range(vector.size):
@@ -232,15 +232,15 @@ def get_column_from_chunk(vector: Vector) -> list:
                 epoch_micros = vector.data.timeData.data[
                     row] if not vector.isConstantVector else vector.data.timeConstantData.data
                 if ((vector.isConstantVector and vector.data.timeConstantData.zoneData is not None) or
-                        vector.data.timeData.zoneData is not None):
-                    zone = vector.data.timeData.zoneData[
+                        (not vector.isConstantVector and vector.data.timeData.zoneData is not None)):
+                    zone_id = vector.data.timeData.zoneData[
                         row] if not vector.isConstantVector else vector.data.timeConstantData.zoneData
+                    zone = timezone_from_offset(zone_id)
                 epoch_seconds = floor_div(epoch_micros, 1000_000)
                 micros_of_the_day = floor_mod(epoch_micros, 1000_000)
-                zone_offset = pytz.timezone(zone)
-                date_time = datetime.fromtimestamp(epoch_seconds, zone_offset)
+                date_time = datetime.fromtimestamp(epoch_seconds, zone)
                 date_time = date_time + timedelta(microseconds=micros_of_the_day)
-                value_array.append(date_time.strftime("%Y-%m-%d %H:%M:%S"))
+                value_array.append(date_time.isoformat(timespec='milliseconds'))
         elif d_type == VectorType.STRING or d_type == VectorType.ARRAY or d_type == VectorType.MAP or d_type == VectorType.STRUCT:
             for row in range(vector.size):
                 if get_null(vector, row):

{e6data-python-connector-2.1.17 → e6data_python_connector-2.1.19}/e6data_python_connector/date_time_utils.py

@@ -1,3 +1,6 @@
+from typing import Final
+import pytz
+
 TIME_ZONES = {
     "+12:00": ["Pacific/Kwajalein", "Pacific/Wallis", "Pacific/Funafuti", "Pacific/Nauru", "Kwajalein", "Pacific/Wake",
                "Pacific/Norfolk", "Pacific/Tarawa", "Asia/Kamchatka", "Etc/GMT-12", "Asia/Anadyr", "Pacific/Majuro", ],
@@ -140,6 +143,8 @@ FORMATS = {
     "ss": "%S"
 }
 
+zone_map: Final = dict()
+
 
 def floor_div(x, y):
     q = x // y
@@ -155,6 +160,24 @@ def floor_mod(x, y):
     return r
 
 
+def timezone_from_offset(offset_string) -> pytz:
+    # Parse the offset string into hours and minutes
+    sign = -1 if offset_string[0] == "-" else 1
+    if ":" in offset_string:
+        if offset_string in zone_map:
+            return zone_map[offset_string]
+        with_out_sign = offset_string[1:]
+        hours_minutes = with_out_sign.split(":")
+        hours = int(hours_minutes[0])
+        minutes = int(hours_minutes[1])
+        total_minutes = (hours * 60 + minutes) * sign
+        fixed_offset = pytz.FixedOffset(total_minutes)
+        zone_map[offset_string] = fixed_offset
+        return pytz.FixedOffset(total_minutes)
+    else:
+        return pytz.UTC if offset_string == 'Z' else pytz.timezone(offset_string)
+
+
 def get_format(str_format):
     if str_format is None or len(str_format) == 0:
         return "%Y-%m-%d %H:%M:%S"

{e6data-python-connector-2.1.17 → e6data_python_connector-2.1.19/e6data_python_connector.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e6data-python-connector
-Version: 2.1.17
+Version: 2.1.19
 Summary: Client for the e6data distributed SQL Engine.
 Home-page: https://github.com/e6x-labs/e6data-python-connector
 Author: Uniphi, Inc.
@@ -27,7 +27,7 @@ Requires-Dist: sqlalchemy
 
 # e6data Python Connector
 
-![version](https://img.shields.io/badge/version-2.1.17-blue.svg)
+![version](https://img.shields.io/badge/version-2.1.19-blue.svg)
 
 ## Introduction
 

{e6data-python-connector-2.1.17 → e6data_python_connector-2.1.19}/setup.py

@@ -12,7 +12,7 @@
 
 import setuptools
 
-VERSION = [2, 1, 17]
+VERSION = [2, 1, 19]
 
 
 def get_long_desc():