e6data-python-connector 2.1.14.dev1__py3-none-any.whl → 2.1.16__py3-none-any.whl

e6data_python_connector/datainputstream.py

@@ -204,7 +204,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 = vector.zoneOffset
+    zone = 'UTC'
     try:
         if d_type == VectorType.LONG:
             for row in range(vector.size):
@@ -221,7 +221,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('UTC') if zone == 'Z' else pytz.timezone(zone)
+                zone_offset = pytz.timezone(zone)
                 date = datetime.fromtimestamp(epoch_seconds, zone_offset)
                 value_array.append(date.strftime("%Y-%m-%d"))
         elif d_type == VectorType.DATETIME:
@@ -231,9 +231,10 @@ def get_column_from_chunk(vector: Vector) -> list:
                     continue
                 epoch_micros = vector.data.timeData.data[
                     row] if not vector.isConstantVector else vector.data.timeConstantData.data
+                zone = vector.data.timeData.zoneData[row] if not vector.isConstantVector else vector.data.timeConstantData.zoneData
                 epoch_seconds = floor_div(epoch_micros, 1000_000)
                 micros_of_the_day = floor_mod(epoch_micros, 1000_000)
-                zone_offset = pytz.timezone('UTC') if zone == 'Z' else pytz.timezone(zone)
+                zone_offset = pytz.timezone(zone)
                 date_time = datetime.fromtimestamp(epoch_seconds, zone_offset)
                 date_time = date_time + timedelta(microseconds=micros_of_the_day)
                 value_array.append(date_time.strftime("%Y-%m-%d %H:%M:%S"))

e6data_python_connector/e6data_grpc.py

@@ -416,6 +416,10 @@ class Cursor(DBAPICursor):
     def close(self):
         """Close the operation handle"""
         # self.connection.close()
+        try:
+            self.clear()
+        except:
+            pass
         self._arraysize = None
         self.connection = None
         self._data = None

e6data_python_connector/e6x_vector/__init__.py

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

e6data_python_connector/e6x_vector/ttypes.py

@@ -1238,12 +1238,14 @@ class TimeConstantData(object):
     """
     Attributes:
      - data
+     - zoneData
 
     """
 
 
-    def __init__(self, data=None,):
+    def __init__(self, data=None, zoneData=None,):
         self.data = data
+        self.zoneData = zoneData
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -1259,6 +1261,11 @@ class TimeConstantData(object):
                     self.data = iprot.readI64()
                 else:
                     iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.STRING:
+                    self.zoneData = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -1273,6 +1280,10 @@ class TimeConstantData(object):
             oprot.writeFieldBegin('data', TType.I64, 1)
             oprot.writeI64(self.data)
             oprot.writeFieldEnd()
+        if self.zoneData is not None:
+            oprot.writeFieldBegin('zoneData', TType.STRING, 2)
+            oprot.writeString(self.zoneData.encode('utf-8') if sys.version_info[0] == 2 else self.zoneData)
+            oprot.writeFieldEnd()
         oprot.writeFieldStop()
         oprot.writeStructEnd()
 
@@ -1352,12 +1363,14 @@ class TimeData(object):
     """
     Attributes:
      - data
+     - zoneData
 
     """
 
 
-    def __init__(self, data=None,):
+    def __init__(self, data=None, zoneData=None,):
         self.data = data
+        self.zoneData = zoneData
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
@@ -1378,6 +1391,16 @@ class TimeData(object):
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.LIST:
+                    self.zoneData = []
+                    (_etype65, _size62) = iprot.readListBegin()
+                    for _i66 in range(_size62):
+                        _elem67 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                        self.zoneData.append(_elem67)
+                    iprot.readListEnd()
+                else:
+                    iprot.skip(ftype)
             else:
                 iprot.skip(ftype)
             iprot.readFieldEnd()
@@ -1391,8 +1414,15 @@ class TimeData(object):
         if self.data is not None:
             oprot.writeFieldBegin('data', TType.LIST, 1)
             oprot.writeListBegin(TType.I64, len(self.data))
-            for iter62 in self.data:
-                oprot.writeI64(iter62)
+            for iter68 in self.data:
+                oprot.writeI64(iter68)
+            oprot.writeListEnd()
+            oprot.writeFieldEnd()
+        if self.zoneData is not None:
+            oprot.writeFieldBegin('zoneData', TType.LIST, 2)
+            oprot.writeListBegin(TType.STRING, len(self.zoneData))
+            for iter69 in self.zoneData:
+                oprot.writeString(iter69.encode('utf-8') if sys.version_info[0] == 2 else iter69)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
@@ -1443,11 +1473,11 @@ class Chunk(object):
             elif fid == 2:
                 if ftype == TType.LIST:
                     self.vectors = []
-                    (_etype66, _size63) = iprot.readListBegin()
-                    for _i67 in range(_size63):
-                        _elem68 = Vector()
-                        _elem68.read(iprot)
-                        self.vectors.append(_elem68)
+                    (_etype73, _size70) = iprot.readListBegin()
+                    for _i74 in range(_size70):
+                        _elem75 = Vector()
+                        _elem75.read(iprot)
+                        self.vectors.append(_elem75)
                     iprot.readListEnd()
                 else:
                     iprot.skip(ftype)
@@ -1468,8 +1498,8 @@ class Chunk(object):
         if self.vectors is not None:
             oprot.writeFieldBegin('vectors', TType.LIST, 2)
             oprot.writeListBegin(TType.STRUCT, len(self.vectors))
-            for iter69 in self.vectors:
-                iter69.write(oprot)
+            for iter76 in self.vectors:
+                iter76.write(oprot)
             oprot.writeListEnd()
             oprot.writeFieldEnd()
         oprot.writeFieldStop()
@@ -1588,6 +1618,7 @@ all_structs.append(TimeConstantData)
 TimeConstantData.thrift_spec = (
     None,  # 0
     (1, TType.I64, 'data', None, None, ),  # 1
+    (2, TType.STRING, 'zoneData', 'UTF8', None, ),  # 2
 )
 all_structs.append(VarcharConstantData)
 VarcharConstantData.thrift_spec = (
@@ -1598,6 +1629,7 @@ all_structs.append(TimeData)
 TimeData.thrift_spec = (
     None,  # 0
     (1, TType.LIST, 'data', (TType.I64, None, False), None, ),  # 1
+    (2, TType.LIST, 'zoneData', (TType.STRING, 'UTF8', False), None, ),  # 2
 )
 all_structs.append(Chunk)
 Chunk.thrift_spec = (

{e6data_python_connector-2.1.14.dev1.dist-info → e6data_python_connector-2.1.16.dist-info}/METADATA

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

{e6data_python_connector-2.1.14.dev1.dist-info → e6data_python_connector-2.1.16.dist-info}/RECORD

@@ -1,15 +1,15 @@
 e6data_python_connector/__init__.py,sha256=x_VwhPQ7XLlthR-NJL9Vl7lkLBRCG2pSjmyZSBHOBpM,103
 e6data_python_connector/common.py,sha256=nk0CDQ5j1iu8DctBOXX4QypPYmxSgIgoA-Cn1UZXLic,9976
 e6data_python_connector/constants.py,sha256=h5w0lWiFsxz__zUZRlo1f72-8mT_vt9gcWvtWh0viFI,682
-e6data_python_connector/datainputstream.py,sha256=DheV5Vo7-UldLAQuhV2payLoFLM8jvaunRTaUhYUhMU,11498
+e6data_python_connector/datainputstream.py,sha256=D9ttXj2VHYBcjI2b08FZMe6ayrJNnf-oWC7x3pYFHXc,11536
 e6data_python_connector/date_time_utils.py,sha256=ew1CjhfB93trRdu8jBOy2ihZNSecDPcmxS1USmWxqzE,13623
 e6data_python_connector/dialect.py,sha256=M7vMHJgbnGqUdlY-XcDyeeXPwll9O7j1YAaySECLNpA,11177
-e6data_python_connector/e6data_grpc.py,sha256=NeJBnsgO6Jx2_4BCECkFm9NvfMVn-Xx7nOeVbKf6TYQ,24528
+e6data_python_connector/e6data_grpc.py,sha256=nqx0B3VkYYDrk18DvFSWupy3uwLSOTx7IrYrPKRfmbg,24599
 e6data_python_connector/exceptions.py,sha256=vrUqdzMq3LjbCmvr5_TcRq9eKmdqGfe-uVjR0BJQf5U,382
 e6data_python_connector/typeId.py,sha256=2EMNWK2SO5CBReNuJphma6xp-69r9GDwwys66t-kSk0,1777
-e6data_python_connector/e6x_vector/__init__.py,sha256=YFcZTT8Cm-6Y4oTiCaqq0DT1lw2W09WqoEc5_pTAwW0,34
+e6data_python_connector/e6x_vector/__init__.py,sha256=roZylODoZ74ukIbqzohNkmXId7Oh3DJTwT5lSGHFS4c,33
 e6data_python_connector/e6x_vector/constants.py,sha256=QPD8cJw4a7t7JD4PTzbxj1CZKZ1lQ0TPK2Uzg72S9dE,366
-e6data_python_connector/e6x_vector/ttypes.py,sha256=TN1MQ2EKU6hYEre2FZubBSGrB2vWAYW5aU2_O_IuyMw,54197
+e6data_python_connector/e6x_vector/ttypes.py,sha256=z2NigHdavCg1l1paXGSIo_1BMBnRJ85Puup9mcAwMDw,55854
 e6data_python_connector/server/QueryEngineService.py,sha256=IDX2Yi9m_QFZ8L4FoiYrl8i7YL8GjTRonblKKFZsapU,198503
 e6data_python_connector/server/__init__.py,sha256=8eK3WgN4xfJiSNm4bUrnXb5ZgjMUEjdStbUahQQrJII,56
 e6data_python_connector/server/constants.py,sha256=QPD8cJw4a7t7JD4PTzbxj1CZKZ1lQ0TPK2Uzg72S9dE,366
@@ -17,9 +17,9 @@ e6data_python_connector/server/e6x_engine_pb2.py,sha256=BxJjbijNrEqXQTWEhzLm54Fq
 e6data_python_connector/server/e6x_engine_pb2.pyi,sha256=_aQDLFbSCQ7ubK0Z5ZKh9_VAHFaXbMV55MXYXr85srg,18693
 e6data_python_connector/server/e6x_engine_pb2_grpc.py,sha256=n-eTCsAjsmpgPA_bDansKZq_zMmqkK6TlQGn6IdT6L4,46671
 e6data_python_connector/server/ttypes.py,sha256=uWxwSp4m6e-7SeSEckbZtSduGYmfzXWM09iy5eltBPA,21227
-e6data_python_connector-2.1.14.dev1.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-e6data_python_connector-2.1.14.dev1.dist-info/METADATA,sha256=xsYTjdWra80VGTQrwYQcGHiLNP-t4Uci9oR-6RravXo,6949
-e6data_python_connector-2.1.14.dev1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-e6data_python_connector-2.1.14.dev1.dist-info/entry_points.txt,sha256=MDK4cAOND0preLvq2Tlpnz00wXnP_Y_UopqJsAf3U7Y,77
-e6data_python_connector-2.1.14.dev1.dist-info/top_level.txt,sha256=ChOS6qLf-SQycXr0uBiVxomIfYfbH2SgwrOWhW79ab0,24
-e6data_python_connector-2.1.14.dev1.dist-info/RECORD,,
+e6data_python_connector-2.1.16.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+e6data_python_connector-2.1.16.dist-info/METADATA,sha256=DURxBQIUOpBzZpD7OuF8SAqjwVZga5W6QgEigBUBWBY,6944
+e6data_python_connector-2.1.16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+e6data_python_connector-2.1.16.dist-info/entry_points.txt,sha256=MDK4cAOND0preLvq2Tlpnz00wXnP_Y_UopqJsAf3U7Y,77
+e6data_python_connector-2.1.16.dist-info/top_level.txt,sha256=ChOS6qLf-SQycXr0uBiVxomIfYfbH2SgwrOWhW79ab0,24
+e6data_python_connector-2.1.16.dist-info/RECORD,,