exceeddata-sdk-vdata 2.10.2__tar.gz → 2.10.4__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.1
2
2
  Name: exceeddata_sdk_vdata
3
- Version: 2.10.2
3
+ Version: 2.10.4
4
4
  Summary: ExceedData vData SDK for Python
5
5
  Home-page: http://www.smartsct.com
6
6
  Author: Nick Xie
@@ -32,6 +32,6 @@
32
32
 
33
33
  name = 'vdata'
34
34
 
35
- __version__ = "2.10.2"
35
+ __version__ = "2.10.4"
36
36
  __author__ = 'Nick Xie'
37
37
  __credits__ = 'Smart Software for Car Technologies Inc'
@@ -25,11 +25,21 @@ class VswToBlfConverter:
25
25
  self._seekables.append(VDataByteReader( data))
26
26
  self._outputFilename = outputFilename
27
27
  self._signals = signals
28
+ self._deletedKeyFormat = None
29
+
30
+ def setDeletedKeyFormat(self, deletedKeyFormat):
31
+ '''
32
+ :param deletedKeyFormat: deletedkey format for 64k page
33
+ :return:
34
+ '''
35
+ self._deletedKeyFormat = deletedKeyFormat
28
36
 
29
37
  def convert(self, colParserFun=colParser ):
30
38
  factory = VDataReaderFactory()
31
39
  factory.setDataReaders(self._seekables)
32
40
  factory.setSignals(signals=self._signals)
41
+ if self._deletedKeyFormat is not None:
42
+ factory.setDeletedKeyFormat(self._deletedKeyFormat)
33
43
  reader = factory.open()
34
44
  vdf = reader.df()
35
45
  #print(vdf.cols)
@@ -110,11 +120,21 @@ class VswToAscConverter:
110
120
  self._seekables.append(VDataByteReader( data))
111
121
  self._outputFilename = outputFilename
112
122
  self._signals = signals
123
+ self._deletedKeyFormat = None
124
+
125
+ def setDeletedKeyFormat(self, deletedKeyFormat):
126
+ '''
127
+ :param deletedKeyFormat: deletedkey format for 64k page
128
+ :return:
129
+ '''
130
+ self._deletedKeyFormat = deletedKeyFormat
113
131
 
114
132
  def convert(self, colParserFun=colParser):
115
133
  factory = VDataReaderFactory()
116
134
  factory.setDataReaders(self._seekables)
117
135
  factory.setSignals(signals=self._signals)
136
+ if self._deletedKeyFormat is not None:
137
+ factory.setDeletedKeyFormat(self._deletedKeyFormat)
118
138
  reader = factory.open()
119
139
  vdf = reader.df()
120
140
  #print(vdf.cols)
@@ -142,18 +162,18 @@ class VswToAscConverter:
142
162
  for i in range (1, len(row)):
143
163
  #store the signal byte array for not null column data.
144
164
  #如果信号非空,则生成相应的数据
145
- if row[i] != None and isinstance(row[i], (list)) and can_info[i-1][0]!=-1:
165
+ if row[i] is not None and isinstance(row[i], (list)) and can_info[i - 1][0]!=-1:
146
166
  msg = Message(timestamp=row[0]/1000.0, channel=can_info[i-1][0]-1,arbitration_id=can_info[i-1][1],data= row[i], is_fd=True, is_extended_id =can_info[i-1][2])
147
167
  #写入ASC文件
148
168
  writer.on_message_received(msg)
149
- elif row[i] != None and isinstance(row[i], (bytes, bytearray)) and can_info[i-1][0]!=-1:
169
+ elif row[i] is not None and isinstance(row[i], (bytes, bytearray)) and can_info[i - 1][0]!=-1:
150
170
  # if length > 64, skip
151
171
  if len(row[i]) > 64:
152
172
  continue
153
173
  msg = Message(timestamp=row[0]/1000.0, channel=can_info[i-1][0]-1,arbitration_id=can_info[i-1][1],data= row[i], is_fd=True, is_extended_id =can_info[i-1][2])
154
174
  #写入ASC文件
155
175
  writer.on_message_received(msg)
156
- elif row[i] != None and can_info[i-1][0]!=-1:
176
+ elif row[i] is not None and can_info[i - 1][0]!=-1:
157
177
  data=[1]
158
178
  data[0] =row[i]
159
179
  msg = Message(timestamp=row[0]/1000.0, channel=can_info[i-1][0] -1 ,arbitration_id=can_info[i-1][1],data= data, is_fd=True, is_extended_id = can_info[i-1][2])
@@ -31,7 +31,7 @@
31
31
  # of the copyright holder.
32
32
  #
33
33
  # Author: Nick Xie
34
- # Version: 2.10.2
34
+ # Version: 2.10.3
35
35
  #
36
36
  # Note: for specification flag compatibility, it is rare that vsw uses snappy.
37
37
  # Uncomment the following if used and python-snappy is installed.
@@ -159,7 +159,7 @@ class VDataMeta:
159
159
  >>> meta = VDataReader.getMeta(file)
160
160
  >>> info = meta.extendedInfo()
161
161
  '''
162
- def __init__(self, formatVersion=0, compressMethod=0, encryptMethod=0, blocksCount=0, storageStartTime=0, storageEndTime=0, queryStartTime=0, queryEndTime=0, extendedInfo=None, pageSizeCode=0, keyTypeCode=0):
162
+ def __init__(self, formatVersion=0, compressMethod=0, encryptMethod=0, blocksCount=0, storageStartTime=0, storageEndTime=0, queryStartTime=0, queryEndTime=0, extendedInfo=None, pageSizeCode=0, keyTypeCode=0, reserved=0):
163
163
  '''
164
164
  The constructor for the meta info. For valid values see VData format specification.
165
165
 
@@ -185,7 +185,8 @@ class VDataMeta:
185
185
  self._extendedInfo = extendedInfo
186
186
  self._pageSizeCode = pageSizeCode
187
187
  self._keyTypeCode = keyTypeCode
188
-
188
+ self._reserved = reserved
189
+
189
190
 
190
191
  def __repr__(self):
191
192
  '''
@@ -307,7 +308,7 @@ class VDataMeta:
307
308
  return 6
308
309
 
309
310
  def getSeriesTimestampLength (self):
310
- if (self._keyTypeCode & 0x0f == 1) and ((self._keyTypeCode >> 4) & 0x0F == 0):
311
+ if (self._keyTypeCode & 0x0f == 1) and ((self._keyTypeCode >> 4) & 0x0F == 0) and (self._reserved == 0):
311
312
  return 43
312
313
  else:
313
314
  return 41
@@ -618,7 +619,7 @@ class VDataFormulaBlob:
618
619
  self._signalDecoder = None
619
620
 
620
621
  def apply(self, val):
621
- if(self._signalDecoder != None):
622
+ if self._signalDecoder is not None:
622
623
  return self._signalDecoder.decode(val)
623
624
  else:
624
625
  return val
@@ -2354,20 +2355,20 @@ class VDataSeriesDecodeBuilder(object):
2354
2355
  _subtype = (sub >> 4) & 0x0F
2355
2356
  _encoder = sub & 0x0F
2356
2357
  _offset = 32
2357
-
2358
+
2358
2359
  element_exist_array = []
2359
2360
 
2360
- if (_version > 27 ):
2361
- #for nullable element array, load null element map.
2362
- _byte_length = 2 if _length<=16 else (_length+7)//8
2363
- _offset = 32 + _byte_length *8
2364
- _bitmap = btreader.read(_offset)
2365
- for i in range(_length):
2366
- element_exist_array.append(True)
2367
- byte_index = i // 8
2368
- bit_index = 7- i % 8
2361
+ if (_version == 28):
2362
+ # for nullable element array, load null element map.
2363
+ _byte_length = 2 if _length <= 16 else (_length + 7) // 8
2364
+ _bitmap = btreader.read(_byte_length)
2365
+ _offset = 32 + _byte_length * 8
2369
2366
 
2370
- element_exist_array.append( (((_bitmap[byte_index]>> bit_index) & 0x01) == 1 ))
2367
+ for i in range(_length):
2368
+ byte_index = i // 8
2369
+ bit_index = 7 - i % 8
2370
+ val = ((_bitmap[byte_index] >> bit_index) & 0x01) == 1
2371
+ element_exist_array.append(val)
2371
2372
 
2372
2373
  else :
2373
2374
  for i in range(_length):
@@ -3724,6 +3725,8 @@ class VDataDecoder:
3724
3725
  self._buckets = None
3725
3726
  self._keys = None
3726
3727
  self._signalDecoders={}
3728
+ self._deletedKeyFormat = "DELETED_KEY_%07X"
3729
+ self._keyDescFormat = "0x%08X"
3727
3730
 
3728
3731
  def __repr__(self):
3729
3732
  if self._meta is None:
@@ -3761,6 +3764,12 @@ class VDataDecoder:
3761
3764
  def setSignalDecoders(self, signalDecoders):
3762
3765
  self._signalDecoders = signalDecoders
3763
3766
 
3767
+ def setDeletedKeyFormat(self, deletedKeyFormat):
3768
+ self._deletedKeyFormat = deletedKeyFormat
3769
+
3770
+ def setKeyDescFormat(self, keyDescFormat):
3771
+ self._keyDescFormat = keyDescFormat
3772
+
3764
3773
  def initialize(self):
3765
3774
  hasSignalFilter = len(self._signals) > 0 or len(self._prefixes) > 0
3766
3775
  formulas = {}
@@ -3785,13 +3794,13 @@ class VDataDecoder:
3785
3794
  logger.debug("file query end time: " + str(self._meta.queryEndTime()))
3786
3795
 
3787
3796
  if self._meta.getPageSize() != 0x8000:
3788
- self.readKeys()
3797
+ self.readKeys(self._deletedKeyFormat)
3789
3798
  else:
3790
3799
  self.readStfKeys()
3791
3800
 
3792
3801
  for name, key in self._keys.items():
3793
3802
  formulas[key._seriesid] = key._formula
3794
- if (self._signalDecoders !=None) & (name in self._signalDecoders):
3803
+ if (self._signalDecoders is not None) & (name in self._signalDecoders):
3795
3804
  if (isinstance(key._formula , VDataFormulaBlob)):
3796
3805
  de = self._signalDecoders[name]
3797
3806
  key._formula.setSignalDeocder(de)
@@ -3987,7 +3996,7 @@ class VDataDecoder:
3987
3996
  # Set the query range for each series of the bucket
3988
3997
  VDataBucketUtils.updateBucketQueryRange(self._buckets, self._meta, self._signalQueueMode, self._queryFilter, self._queryStartTime, self._queryEndTime)
3989
3998
 
3990
- def readKeys(self):
3999
+ def readKeys(self, deletedKeyFormat):
3991
4000
  compressMethod = self._meta._compressMethod
3992
4001
 
3993
4002
  (keysCount, length) = _struct.unpack('<ii', self._reader.read(8))
@@ -4008,7 +4017,7 @@ class VDataDecoder:
4008
4017
  b = datareader.read(1)
4009
4018
 
4010
4019
  if len(keydesc) == 0:
4011
- keydesc = f"{keyid:X}"
4020
+ keydesc = deletedKeyFormat % keyid
4012
4021
  formula = fmbulider.build(keydesc, self._insensitiveCase)
4013
4022
  sname = self.getUniqueName(self._keys, formula._name)
4014
4023
  if (sname != formula._name):
@@ -4030,7 +4039,7 @@ class VDataDecoder:
4030
4039
  for i in range (keysCount):
4031
4040
  decode.next()
4032
4041
  self._keyIds[i] = decode.get()
4033
- sname ="0x%08X"%self._keyIds[i]
4042
+ sname = self._keyDescFormat % self._keyIds[i]
4034
4043
  self._keys[sname] = VDataSeriesSpec(sname, self._keyIds[i] , VDataFormulaNone(sname), '')
4035
4044
 
4036
4045
 
@@ -4789,6 +4798,8 @@ class VDataReaderFactory:
4789
4798
  self._columnExpandMode = None
4790
4799
  self._signalQueueMode = None
4791
4800
  self._signalDecoders = {}
4801
+ self._deletedKeyFormat = "DELETED_KEY_%07X"
4802
+ self._keyDescFormat = "0x%08X"
4792
4803
 
4793
4804
  def setDataReaders(self, readers):
4794
4805
  '''
@@ -4896,6 +4907,19 @@ class VDataReaderFactory:
4896
4907
  '''
4897
4908
  self._signalDecoders = signalDecoders
4898
4909
 
4910
+ def setDeletedKeyFormat(self, deletedKeyFormat):
4911
+ '''
4912
+ :param deletedKeyFormat: deletedkey format for 64k page
4913
+ :return:
4914
+ '''
4915
+ self._deletedKeyFormat = deletedKeyFormat
4916
+
4917
+ def setKeyDescFormat(self, keyDescFormat):
4918
+ """
4919
+ :param keyDescFormat: key desc format for 32k page
4920
+ """
4921
+ self._keyDescFormat = keyDescFormat
4922
+
4899
4923
  def open(self):
4900
4924
  '''
4901
4925
  Create the data reader.
@@ -4903,7 +4927,7 @@ class VDataReaderFactory:
4903
4927
  Returns:
4904
4928
  VDataReader
4905
4929
  '''
4906
- return VDataReader(self._readers, self._signals, self._insensitiveCase, self._queryFilter, self._queryStartTime, self._queryEndTime, self._readLivingData, self._columnExpandMode, self._signalQueueMode, self._signalDecoders)
4930
+ return VDataReader(self._readers, self._signals, self._insensitiveCase, self._queryFilter, self._queryStartTime, self._queryEndTime, self._readLivingData, self._columnExpandMode, self._signalQueueMode, self._signalDecoders, self._deletedKeyFormat, self._keyDescFormat)
4907
4931
 
4908
4932
  class VDataReader:
4909
4933
  '''
@@ -4914,7 +4938,7 @@ class VDataReader:
4914
4938
  >>> frame = reader.df()
4915
4939
  '''
4916
4940
 
4917
- def __init__(self, readers, signals=None, insensitiveCase=False, queryFilter=True, queryStartTime=0, queryEndTime=0, readLivingData=True, columnExpandMode=None, signalQueueMode=None, signalDecoders={}):
4941
+ def __init__(self, readers, signals=None, insensitiveCase=False, queryFilter=True, queryStartTime=0, queryEndTime=0, readLivingData=True, columnExpandMode=None, signalQueueMode=None, signalDecoders={}, deletedKeyFormat="DELETED_KEY_%07X", keyDescFormat = "0x%08X"):
4918
4942
  '''
4919
4943
  The constructor for data reader. Deprecated since 2.7.1. Use VDataReaderFactory instead.
4920
4944
 
@@ -4939,6 +4963,8 @@ class VDataReader:
4939
4963
  self._livingDataBuffer = 1000 #1000ms buffer
4940
4964
  self._signalDecoders = signalDecoders
4941
4965
  self.metas =[]
4966
+ self._deletedKeyFormat = deletedKeyFormat
4967
+ self._keyDescFormat = keyDescFormat
4942
4968
  buckets = []
4943
4969
 
4944
4970
  livingData = readLivingData
@@ -4959,6 +4985,8 @@ class VDataReader:
4959
4985
  decoder.setColumnExpandMode(self._columnExpandMode)
4960
4986
  decoder.setSignalQueueMode(self._signalQueueMode)
4961
4987
  decoder.setSignalDecoders(signalDecoders)
4988
+ decoder.setDeletedKeyFormat(self._deletedKeyFormat)
4989
+ decoder.setKeyDescFormat(self._keyDescFormat)
4962
4990
  decoder.initialize()
4963
4991
  VDataDecodeUtils.sortAddDecoder(self._decoders, decoder)
4964
4992
 
@@ -5091,7 +5119,8 @@ class VDataReader:
5091
5119
  qetime = 0 # query end time
5092
5120
  extlength = 0
5093
5121
  pageSizeCode = 0
5094
- keyTypeCode = 0
5122
+ keyTypeCode = 0
5123
+ reserved = 0
5095
5124
 
5096
5125
  if (formatVersion > 0):
5097
5126
  if (formatVersion < 26):
@@ -5102,12 +5131,12 @@ class VDataReader:
5102
5131
  if (formatVersion > 26):
5103
5132
  pageSizeCode = _reader.read(1)[0]
5104
5133
  keyTypeCode = _reader.read(1)[0]
5105
- _reader.read(4) # reserved
5134
+ reserved = _struct.unpack('<i', _reader.read(4)) # reserved
5106
5135
  else:
5107
5136
  _reader.read(6) # reserved
5108
5137
 
5109
5138
  extbytes = _reader.read(extlength) if (extlength > 0) else []
5110
- return VDataMeta(formatVersion=formatVersion, compressMethod=compressMethod, encryptMethod=encryptMethod, blocksCount=blocksCount, storageStartTime=sstime, storageEndTime=setime, queryStartTime=qstime, queryEndTime=qetime, extendedInfo=extbytes, pageSizeCode = pageSizeCode , keyTypeCode= keyTypeCode)
5139
+ return VDataMeta(formatVersion=formatVersion, compressMethod=compressMethod, encryptMethod=encryptMethod, blocksCount=blocksCount, storageStartTime=sstime, storageEndTime=setime, queryStartTime=qstime, queryEndTime=qetime, extendedInfo=extbytes, pageSizeCode = pageSizeCode , keyTypeCode= keyTypeCode, reserved = reserved)
5111
5140
 
5112
5141
 
5113
5142
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.1
2
2
  Name: exceeddata-sdk-vdata
3
- Version: 2.10.2
3
+ Version: 2.10.4
4
4
  Summary: ExceedData vData SDK for Python
5
5
  Home-page: http://www.smartsct.com
6
6
  Author: Nick Xie
@@ -33,13 +33,13 @@
33
33
  from setuptools import setup
34
34
 
35
35
  setup(name='exceeddata_sdk_vdata',
36
- version='2.10.2',
36
+ version='2.10.4',
37
37
  description='ExceedData vData SDK for Python',
38
38
  url='http://www.smartsct.com',
39
39
  author='Nick Xie',
40
40
  author_email='nickxie@smartsct.com',
41
41
  license='MIT',
42
- license_files = ('LICENSE'),
42
+ license_files = ('LICENSE',),
43
43
  install_requires=['python-snappy', 'zstd'],
44
44
  zip_safe=False,
45
45
  classifiers=[