exceeddata-sdk-vdata 2.10.6__tar.gz → 2.10.8__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.6
3
+ Version: 2.10.8
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.6"
35
+ __version__ = "2.10.8"
36
36
  __author__ = 'Nick Xie'
37
37
  __credits__ = 'Smart Software for Car Technologies Inc'
@@ -4962,7 +4962,7 @@ class VDataReader:
4962
4962
  self._frame = VDataFrame(buckets, series, signalFilter, columnExpandMode, signalQueueMode)
4963
4963
 
4964
4964
  objectStartTime = queryStartTime if queryFilter else 0
4965
- objectEndTime = queryEndTime if queryFilter else 0
4965
+ objectEndTime = 0
4966
4966
  for decoder in self._decoders:
4967
4967
  if (queryStartTime == 0):
4968
4968
  meta = decoder.meta()
@@ -4973,16 +4973,28 @@ class VDataReader:
4973
4973
  st = bucketst
4974
4974
 
4975
4975
  objectStartTime = st if objectStartTime == 0 else min(objectStartTime, st)
4976
-
4977
- if (queryEndTime == 0):
4978
- meta = decoder.meta()
4976
+
4977
+ # Align with Java VDataReader (GWM-QD-INT-1845 / queryFilter=false storage end):
4978
+ # queryFilter=false -> always storage end; queryFilter=true -> query end or storage fallback.
4979
+ # Bucket endTime may be 0 on old vsw (e.g. format v23), so do not prefer bucket over storage.
4980
+ meta = decoder.meta()
4981
+ if not queryFilter:
4982
+ et = meta.storageEndTime()
4983
+ else:
4979
4984
  et = meta.storageEndTime() if meta.queryEndTime() == 0 else meta.queryEndTime()
4980
- objectEndTime = et if objectEndTime == 0 else max(objectEndTime, et)
4981
-
4982
- if (meta.queryEndTime() == 0):
4983
- dbuckets = decoder.buckets()
4984
- if (len(dbuckets) > 0 and dbuckets[len(dbuckets) - 1].isLiving()):
4985
- objectEndTime = objectEndTime + self._livingDataBuffer
4985
+ if et == 0:
4986
+ for bucket in decoder.buckets():
4987
+ et = max(et, bucket.getEndTime())
4988
+ objectEndTime = et if objectEndTime == 0 else max(objectEndTime, et)
4989
+
4990
+ if meta.queryEndTime() == 0:
4991
+ dbuckets = decoder.buckets()
4992
+ if len(dbuckets) > 0 and dbuckets[len(dbuckets) - 1].isLiving():
4993
+ objectEndTime = objectEndTime + self._livingDataBuffer
4994
+ if queryFilter:
4995
+ objectStartTime = max(objectStartTime, queryStartTime)
4996
+ objectEndTime = objectEndTime if queryEndTime == 0 else min(objectEndTime, queryEndTime)
4997
+ objectEndTime = objectStartTime if objectStartTime > objectEndTime else objectEndTime
4986
4998
  self._frame.setStartTime(objectStartTime)
4987
4999
  self._frame.setEndTime(objectEndTime)
4988
5000
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 1.1
2
2
  Name: exceeddata-sdk-vdata
3
- Version: 2.10.6
3
+ Version: 2.10.8
4
4
  Summary: ExceedData vData SDK for Python
5
5
  Home-page: http://www.smartsct.com
6
6
  Author: Nick Xie
@@ -33,14 +33,14 @@
33
33
  from setuptools import setup
34
34
 
35
35
  setup(name='exceeddata_sdk_vdata',
36
- version='2.10.6',
36
+ version='2.10.8',
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
42
  license_files = ('LICENSE',),
43
- install_requires=['python-snappy', 'zstd'],
43
+ install_requires=['python-snappy', 'zstd', 'python-can'],
44
44
  zip_safe=False,
45
45
  classifiers=[
46
46
  'Development Status :: 4 - Beta',