e6data-python-connector 2.1.18__tar.gz → 2.1.20__tar.gz

{e6data-python-connector-2.1.18/e6data_python_connector.egg-info → e6data_python_connector-2.1.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e6data-python-connector
-Version: 2.1.18
+Version: 2.1.20
 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.18-blue.svg)
+![version](https://img.shields.io/badge/version-2.1.20-blue.svg)
 
 ## Introduction
 

{e6data-python-connector-2.1.18 → e6data_python_connector-2.1.20}/README.md

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

{e6data-python-connector-2.1.18 → e6data_python_connector-2.1.20}/e6data_python_connector/datainputstream.py

@@ -205,7 +205,7 @@ def read_rows_from_chunk(query_columns_description: list, buffer):
 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):
@@ -222,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):
@@ -234,13 +233,12 @@ def get_column_from_chunk(vector: Vector) -> list:
                     row] if not vector.isConstantVector else vector.data.timeConstantData.data
                 if ((vector.isConstantVector and vector.data.timeConstantData.zoneData is not None) or
                         (not vector.isConstantVector and vector.data.timeData.zoneData is not None)):
-                    zone = vector.data.timeData.zoneData[
+                    zone_id = vector.data.timeData.zoneData[
                         row] if not vector.isConstantVector else vector.data.timeConstantData.zoneData
-                    zone = timezone_from_offset(zone)
+                    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.isoformat(timespec='milliseconds'))
         elif d_type == VectorType.STRING or d_type == VectorType.ARRAY or d_type == VectorType.MAP or d_type == VectorType.STRUCT:
@@ -285,6 +283,9 @@ def get_column_from_chunk(vector: Vector) -> list:
                     continue
                 value_array.append(vector.data.int32Data.data[
                                        row] if not vector.isConstantVector else vector.data.numericConstantData.data)
+        elif d_type == VectorType.NULL:
+            for row in range(vector.size):
+                value_array.append(None)
         else:
             value_array.append(None)
     except Exception as e:

{e6data-python-connector-2.1.18 → e6data_python_connector-2.1.20}/e6data_python_connector/date_time_utils.py

@@ -1,4 +1,3 @@
-from datetime import datetime, timedelta
 from typing import Final
 import pytz
 
@@ -161,7 +160,7 @@ def floor_mod(x, y):
     return r
 
 
-def timezone_from_offset(offset_string) -> str:
+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:
@@ -171,22 +170,12 @@ def timezone_from_offset(offset_string) -> str:
         hours_minutes = with_out_sign.split(":")
         hours = int(hours_minutes[0])
         minutes = int(hours_minutes[1])
-
-        # Calculate the offset in seconds
         total_minutes = (hours * 60 + minutes) * sign
-        offset = timedelta(minutes=total_minutes)
-
-        # Get a datetime object with the current time
-        now = datetime.now()
-        # Search for a timezone with the given offset
-        for tz_name in pytz.all_timezones:
-            tz = pytz.timezone(tz_name)
-            tz_offset = tz.utcoffset(now, is_dst=False)
-            if tz_offset == offset:
-                zone_map[offset_string] = tz_name
-                return tz_name
+        fixed_offset = pytz.FixedOffset(total_minutes)
+        zone_map[offset_string] = fixed_offset
+        return pytz.FixedOffset(total_minutes)
     else:
-        return 'UTC' if offset_string == 'Z' else offset_string
+        return pytz.UTC if offset_string == 'Z' else pytz.timezone(offset_string)
 
 
 def get_format(str_format):

e6data_python_connector-2.1.20/e6data_python_connector/e6x_vector/__init__.py

@@ -0,0 +1 @@
+__all__ = ['ttypes', 'constants']

{e6data-python-connector-2.1.18/e6data_python_connector/server → e6data_python_connector-2.1.20/e6data_python_connector/e6x_vector}/constants.py

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.19.0)
+# Autogenerated by Thrift Compiler (0.20.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

{e6data-python-connector-2.1.18 → e6data_python_connector-2.1.20}/e6data_python_connector/e6x_vector/ttypes.py

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.19.0)
+# Autogenerated by Thrift Compiler (0.20.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -31,6 +31,7 @@ class VectorType(object):
     STRUCT = 11
     MAP = 12
     ARRAY = 13
+    NULL = 14
 
     _VALUES_TO_NAMES = {
         0: "BINARY",
@@ -47,6 +48,7 @@ class VectorType(object):
         11: "STRUCT",
         12: "MAP",
         13: "ARRAY",
+        14: "NULL",
     }
 
     _NAMES_TO_VALUES = {
@@ -64,6 +66,7 @@ class VectorType(object):
         "STRUCT": 11,
         "MAP": 12,
         "ARRAY": 13,
+        "NULL": 14,
     }
 
 

{e6data-python-connector-2.1.18 → e6data_python_connector-2.1.20/e6data_python_connector.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e6data-python-connector
-Version: 2.1.18
+Version: 2.1.20
 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.18-blue.svg)
+![version](https://img.shields.io/badge/version-2.1.20-blue.svg)
 
 ## Introduction
 

{e6data-python-connector-2.1.18 → e6data_python_connector-2.1.20}/setup.py

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

e6data-python-connector-2.1.18/e6data_python_connector/e6x_vector/__init__.py

@@ -1 +0,0 @@
-__all__ = ['ttypes', 'constants']