Merge pull request #76 from ess-dmsc/new_se00

Fixes due to changes in se00 schema in streaming-data-types

Author: kmurica

.gitignore

@@ -50,11 +50,13 @@ coverage.xml
 *.py,cover
 .hypothesis/
 .pytest_cache/
-
 # Translations
 *.mo
 *.pot
 
+# macOS artifacts
+*.DS_Store
+
 # Django stuff:
 *.log
 local_settings.py

streaming_data_types/array_1d_se00.py

@@ -16,19 +16,19 @@
 )
 
 from streaming_data_types.fbschemas.array_1d_se00.Location import Location
-from streaming_data_types.fbschemas.array_1d_se00.SampleEnvironmentData import (
-    SampleEnvironmentData,
-    SampleEnvironmentDataAddChannel,
-    SampleEnvironmentDataAddMessageCounter,
-    SampleEnvironmentDataAddName,
-    SampleEnvironmentDataAddPacketTimestamp,
-    SampleEnvironmentDataAddTimeDelta,
-    SampleEnvironmentDataAddTimestampLocation,
-    SampleEnvironmentDataAddTimestamps,
-    SampleEnvironmentDataAddValues,
-    SampleEnvironmentDataAddValuesType,
-    SampleEnvironmentDataEnd,
-    SampleEnvironmentDataStart,
+from streaming_data_types.fbschemas.array_1d_se00.se00_SampleEnvironmentData import (
+    se00_SampleEnvironmentData,
+    se00_SampleEnvironmentDataAddChannel,
+    se00_SampleEnvironmentDataAddMessageCounter,
+    se00_SampleEnvironmentDataAddName,
+    se00_SampleEnvironmentDataAddPacketTimestamp,
+    se00_SampleEnvironmentDataAddTimeDelta,
+    se00_SampleEnvironmentDataAddTimestampLocation,
+    se00_SampleEnvironmentDataAddTimestamps,
+    se00_SampleEnvironmentDataAddValues,
+    se00_SampleEnvironmentDataAddValuesType,
+    se00_SampleEnvironmentDataEnd,
+    se00_SampleEnvironmentDataStart,
 )
 from streaming_data_types.fbschemas.array_1d_se00.ValueUnion import ValueUnion
 from streaming_data_types.utils import check_schema_identifier
@@ -105,19 +105,19 @@ def serialise_se00(
 
     name_offset = builder.CreateString(name)
 
-    SampleEnvironmentDataStart(builder)
-    SampleEnvironmentDataAddName(builder, name_offset)
-    SampleEnvironmentDataAddTimeDelta(builder, sample_ts_delta)
-    SampleEnvironmentDataAddTimestampLocation(builder, ts_location)
-    SampleEnvironmentDataAddMessageCounter(builder, message_counter)
-    SampleEnvironmentDataAddChannel(builder, channel)
-    SampleEnvironmentDataAddPacketTimestamp(builder, timestamp_unix_ns)
-    SampleEnvironmentDataAddValues(builder, value_offset)
-    SampleEnvironmentDataAddValuesType(builder, numpy_type_map[temp_values.dtype])
+    se00_SampleEnvironmentDataStart(builder)
+    se00_SampleEnvironmentDataAddName(builder, name_offset)
+    se00_SampleEnvironmentDataAddTimeDelta(builder, sample_ts_delta)
+    se00_SampleEnvironmentDataAddTimestampLocation(builder, ts_location)
+    se00_SampleEnvironmentDataAddMessageCounter(builder, message_counter)
+    se00_SampleEnvironmentDataAddChannel(builder, channel)
+    se00_SampleEnvironmentDataAddPacketTimestamp(builder, timestamp_unix_ns)
+    se00_SampleEnvironmentDataAddValues(builder, value_offset)
+    se00_SampleEnvironmentDataAddValuesType(builder, numpy_type_map[temp_values.dtype])
     if value_timestamps is not None:
-        SampleEnvironmentDataAddTimestamps(builder, timestamps_offset)
+        se00_SampleEnvironmentDataAddTimestamps(builder, timestamps_offset)
 
-    SE_Message = SampleEnvironmentDataEnd(builder)
+    SE_Message = se00_SampleEnvironmentDataEnd(builder)
 
     builder.Finish(SE_Message, file_identifier=FILE_IDENTIFIER)
     return bytes(builder.Output())
@@ -126,7 +126,7 @@ def serialise_se00(
 def deserialise_se00(buffer: Union[bytearray, bytes]) -> Response:
     check_schema_identifier(buffer, FILE_IDENTIFIER)
 
-    SE_data = SampleEnvironmentData.GetRootAsSampleEnvironmentData(buffer, 0)
+    SE_data = se00_SampleEnvironmentData.GetRootAsse00_SampleEnvironmentData(buffer, 0)
 
     value_timestamps = None
     if not SE_data.TimestampsIsNone():

streaming_data_types/fbschemas/array_1d_se00/DoubleArray.py

@@ -1,15 +1,13 @@
 # automatically generated by the FlatBuffers compiler, do not modify
 
-# namespace:
+# namespace: 
 
 import flatbuffers
 from flatbuffers.compat import import_numpy
-
 np = import_numpy()
 
-
 class DoubleArray(object):
-    __slots__ = ["_tab"]
+    __slots__ = ['_tab']
 
     @classmethod
     def GetRootAs(cls, buf, offset=0):
@@ -22,12 +20,9 @@ def GetRootAs(cls, buf, offset=0):
     def GetRootAsDoubleArray(cls, buf, offset=0):
         """This method is deprecated. Please switch to GetRootAs."""
         return cls.GetRootAs(buf, offset)
-
     @classmethod
     def DoubleArrayBufferHasIdentifier(cls, buf, offset, size_prefixed=False):
-        return flatbuffers.util.BufferHasIdentifier(
-            buf, offset, b"\x73\x65\x30\x30", size_prefixed=size_prefixed
-        )
+        return flatbuffers.util.BufferHasIdentifier(buf, offset, b"\x73\x65\x30\x30", size_prefixed=size_prefixed)
 
     # DoubleArray
     def Init(self, buf, pos):
@@ -38,10 +33,7 @@ def Value(self, j):
         o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
         if o != 0:
             a = self._tab.Vector(o)
-            return self._tab.Get(
-                flatbuffers.number_types.Float64Flags,
-                a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 8),
-            )
+            return self._tab.Get(flatbuffers.number_types.Float64Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 8))
         return 0
 
     # DoubleArray
@@ -63,36 +55,15 @@ def ValueIsNone(self):
         o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
         return o == 0
 
-
-def DoubleArrayStart(builder):
-    builder.StartObject(1)
-
-
+def DoubleArrayStart(builder): builder.StartObject(1)
 def Start(builder):
     return DoubleArrayStart(builder)
-
-
-def DoubleArrayAddValue(builder, value):
-    builder.PrependUOffsetTRelativeSlot(
-        0, flatbuffers.number_types.UOffsetTFlags.py_type(value), 0
-    )
-
-
+def DoubleArrayAddValue(builder, value): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(value), 0)
 def AddValue(builder, value):
     return DoubleArrayAddValue(builder, value)
-
-
-def DoubleArrayStartValueVector(builder, numElems):
-    return builder.StartVector(8, numElems, 8)
-
-
+def DoubleArrayStartValueVector(builder, numElems): return builder.StartVector(8, numElems, 8)
 def StartValueVector(builder, numElems):
     return DoubleArrayStartValueVector(builder, numElems)
-
-
-def DoubleArrayEnd(builder):
-    return builder.EndObject()
-
-
+def DoubleArrayEnd(builder): return builder.EndObject()
 def End(builder):
-    return DoubleArrayEnd(builder)
+    return DoubleArrayEnd(builder)

streaming_data_types/fbschemas/array_1d_se00/FloatArray.py

@@ -1,15 +1,13 @@
 # automatically generated by the FlatBuffers compiler, do not modify
 
-# namespace:
+# namespace: 
 
 import flatbuffers
 from flatbuffers.compat import import_numpy
-
 np = import_numpy()
 
-
 class FloatArray(object):
-    __slots__ = ["_tab"]
+    __slots__ = ['_tab']
 
     @classmethod
     def GetRootAs(cls, buf, offset=0):
@@ -22,12 +20,9 @@ def GetRootAs(cls, buf, offset=0):
     def GetRootAsFloatArray(cls, buf, offset=0):
         """This method is deprecated. Please switch to GetRootAs."""
         return cls.GetRootAs(buf, offset)
-
     @classmethod
     def FloatArrayBufferHasIdentifier(cls, buf, offset, size_prefixed=False):
-        return flatbuffers.util.BufferHasIdentifier(
-            buf, offset, b"\x73\x65\x30\x30", size_prefixed=size_prefixed
-        )
+        return flatbuffers.util.BufferHasIdentifier(buf, offset, b"\x73\x65\x30\x30", size_prefixed=size_prefixed)
 
     # FloatArray
     def Init(self, buf, pos):
@@ -38,10 +33,7 @@ def Value(self, j):
         o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
         if o != 0:
             a = self._tab.Vector(o)
-            return self._tab.Get(
-                flatbuffers.number_types.Float32Flags,
-                a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 4),
-            )
+            return self._tab.Get(flatbuffers.number_types.Float32Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 4))
         return 0
 
     # FloatArray
@@ -63,36 +55,15 @@ def ValueIsNone(self):
         o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
         return o == 0
 
-
-def FloatArrayStart(builder):
-    builder.StartObject(1)
-
-
+def FloatArrayStart(builder): builder.StartObject(1)
 def Start(builder):
     return FloatArrayStart(builder)
-
-
-def FloatArrayAddValue(builder, value):
-    builder.PrependUOffsetTRelativeSlot(
-        0, flatbuffers.number_types.UOffsetTFlags.py_type(value), 0
-    )
-
-
+def FloatArrayAddValue(builder, value): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(value), 0)
 def AddValue(builder, value):
     return FloatArrayAddValue(builder, value)
-
-
-def FloatArrayStartValueVector(builder, numElems):
-    return builder.StartVector(4, numElems, 4)
-
-
+def FloatArrayStartValueVector(builder, numElems): return builder.StartVector(4, numElems, 4)
 def StartValueVector(builder, numElems):
     return FloatArrayStartValueVector(builder, numElems)
-
-
-def FloatArrayEnd(builder):
-    return builder.EndObject()
-
-
+def FloatArrayEnd(builder): return builder.EndObject()
 def End(builder):
-    return FloatArrayEnd(builder)
+    return FloatArrayEnd(builder)

streaming_data_types/fbschemas/array_1d_se00/Int16Array.py

@@ -1,15 +1,13 @@
 # automatically generated by the FlatBuffers compiler, do not modify
 
-# namespace:
+# namespace: 
 
 import flatbuffers
 from flatbuffers.compat import import_numpy
-
 np = import_numpy()
 
-
 class Int16Array(object):
-    __slots__ = ["_tab"]
+    __slots__ = ['_tab']
 
     @classmethod
     def GetRootAs(cls, buf, offset=0):
@@ -22,12 +20,9 @@ def GetRootAs(cls, buf, offset=0):
     def GetRootAsInt16Array(cls, buf, offset=0):
         """This method is deprecated. Please switch to GetRootAs."""
         return cls.GetRootAs(buf, offset)
-
     @classmethod
     def Int16ArrayBufferHasIdentifier(cls, buf, offset, size_prefixed=False):
-        return flatbuffers.util.BufferHasIdentifier(
-            buf, offset, b"\x73\x65\x30\x30", size_prefixed=size_prefixed
-        )
+        return flatbuffers.util.BufferHasIdentifier(buf, offset, b"\x73\x65\x30\x30", size_prefixed=size_prefixed)
 
     # Int16Array
     def Init(self, buf, pos):
@@ -38,10 +33,7 @@ def Value(self, j):
         o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
         if o != 0:
             a = self._tab.Vector(o)
-            return self._tab.Get(
-                flatbuffers.number_types.Int16Flags,
-                a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 2),
-            )
+            return self._tab.Get(flatbuffers.number_types.Int16Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 2))
         return 0
 
     # Int16Array
@@ -63,36 +55,15 @@ def ValueIsNone(self):
         o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
         return o == 0
 
-
-def Int16ArrayStart(builder):
-    builder.StartObject(1)
-
-
+def Int16ArrayStart(builder): builder.StartObject(1)
 def Start(builder):
     return Int16ArrayStart(builder)
-
-
-def Int16ArrayAddValue(builder, value):
-    builder.PrependUOffsetTRelativeSlot(
-        0, flatbuffers.number_types.UOffsetTFlags.py_type(value), 0
-    )
-
-
+def Int16ArrayAddValue(builder, value): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(value), 0)
 def AddValue(builder, value):
     return Int16ArrayAddValue(builder, value)
-
-
-def Int16ArrayStartValueVector(builder, numElems):
-    return builder.StartVector(2, numElems, 2)
-
-
+def Int16ArrayStartValueVector(builder, numElems): return builder.StartVector(2, numElems, 2)
 def StartValueVector(builder, numElems):
     return Int16ArrayStartValueVector(builder, numElems)
-
-
-def Int16ArrayEnd(builder):
-    return builder.EndObject()
-
-
+def Int16ArrayEnd(builder): return builder.EndObject()
 def End(builder):
-    return Int16ArrayEnd(builder)
+    return Int16ArrayEnd(builder)