Skip to content

Commit c84e835

Browse files
committed
Run black formatting
1 parent caaa619 commit c84e835

5 files changed

Lines changed: 16 additions & 48 deletions

File tree

harp/io.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ def read(
7373
"""
7474
data = np.fromfile(file, dtype=np.uint8)
7575
if len(data) == 0:
76-
return pd.DataFrame(
77-
columns=columns, index=pd.Index([], dtype=np.float64, name="Time")
78-
)
76+
return pd.DataFrame(columns=columns, index=pd.Index([], dtype=np.float64, name="Time"))
7977

8078
if address is not None and address != data[2]:
8179
raise ValueError(f"expected address {address} but got {data[2]}")
@@ -86,13 +84,9 @@ def read(
8684
payloadtype = data[4]
8785
payloadoffset = 5
8886
if payloadtype & 0x10 != 0:
89-
seconds = np.ndarray(
90-
nrows, dtype=np.uint32, buffer=data, offset=payloadoffset, strides=stride
91-
)
87+
seconds = np.ndarray(nrows, dtype=np.uint32, buffer=data, offset=payloadoffset, strides=stride)
9288
payloadoffset += 4
93-
micros = np.ndarray(
94-
nrows, dtype=np.uint16, buffer=data, offset=payloadoffset, strides=stride
95-
)
89+
micros = np.ndarray(nrows, dtype=np.uint16, buffer=data, offset=payloadoffset, strides=stride)
9690
payloadoffset += 2
9791
time = micros * _SECONDS_PER_TICK + seconds
9892
payloadtype = payloadtype & ~0x10
@@ -121,9 +115,7 @@ def read(
121115

122116
result = pd.DataFrame(payload, index=index, columns=columns)
123117
if keep_type:
124-
msgtype = np.ndarray(
125-
nrows, dtype=np.uint8, buffer=data, offset=0, strides=stride
126-
)
118+
msgtype = np.ndarray(nrows, dtype=np.uint8, buffer=data, offset=0, strides=stride)
127119
msgtype = pd.Categorical.from_codes(msgtype, categories=_messagetypes) # type: ignore
128120
result[MessageType.__name__] = msgtype
129121
return result

harp/model.py

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,12 @@ class Visibility(Enum):
136136
class Register(BaseModel):
137137
address: Annotated[
138138
int,
139-
Field(
140-
le=255, description="Specifies the unique 8-bit address of the register."
141-
),
139+
Field(le=255, description="Specifies the unique 8-bit address of the register."),
142140
]
143141
type: Annotated[PayloadType, BeforeValidator(lambda v: PayloadType[v])]
144142
length: Annotated[
145143
Optional[int],
146-
Field(
147-
ge=1, default=1, description="Specifies the length of the register payload."
148-
),
144+
Field(ge=1, default=1, description="Specifies the length of the register payload."),
149145
]
150146
access: Union[Access, List[Access]] = Field(
151147
..., description="Specifies the expected use of the register."
@@ -191,12 +187,6 @@ class Registers(BaseModel):
191187

192188
class Model(Registers):
193189
device: str = Field(..., description="Specifies the name of the device.")
194-
whoAmI: int = Field(
195-
..., description="Specifies the unique identifier for this device type."
196-
)
197-
firmwareVersion: str = Field(
198-
..., description="Specifies the semantic version of the device firmware."
199-
)
200-
hardwareTargets: str = Field(
201-
..., description="Specifies the semantic version of the device hardware."
202-
)
190+
whoAmI: int = Field(..., description="Specifies the unique identifier for this device type.")
191+
firmwareVersion: str = Field(..., description="Specifies the semantic version of the device firmware.")
192+
hardwareTargets: str = Field(..., description="Specifies the semantic version of the device hardware.")

harp/reader.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ def __call__(
2828
file: Optional[Union[str, bytes, PathLike[Any], BinaryIO]] = None,
2929
epoch: Optional[datetime] = None,
3030
keep_type: bool = False,
31-
) -> DataFrame:
32-
...
31+
) -> DataFrame: ...
3332

3433

3534
class RegisterReader:
@@ -50,9 +49,7 @@ class RegisterMap(UserDict[str, RegisterReader]):
5049

5150
def __init__(self, registers: Mapping[str, RegisterReader]) -> None:
5251
super().__init__(registers)
53-
self._address_map = {
54-
value.register.address: value for value in registers.values()
55-
}
52+
self._address_map = {value.register.address: value for value in registers.values()}
5653

5754
def __getitem__(self, __key: Union[str, int]) -> RegisterReader:
5855
if isinstance(__key, int):
@@ -266,9 +263,7 @@ def create_reader(
266263
base_path = path / device.device if is_dir else path.parent / device.device
267264

268265
reg_readers = {
269-
name: _create_register_parser(
270-
device, name, _ReaderParams(base_path, epoch, keep_type)
271-
)
266+
name: _create_register_parser(device, name, _ReaderParams(base_path, epoch, keep_type))
272267
for name in device.registers.keys()
273268
}
274269
return DeviceReader(device, reg_readers)

harp/schema.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ def _read_common_registers() -> Registers:
1111
return parse_yaml_raw_as(Registers, fileIO.read())
1212

1313

14-
def read_schema(
15-
file: Union[str, PathLike, TextIO], include_common_registers: bool = True
16-
) -> Model:
14+
def read_schema(file: Union[str, PathLike, TextIO], include_common_registers: bool = True) -> Model:
1715
"""Read and parse a device schema from the specified file.
1816
1917
Parameters
@@ -40,9 +38,7 @@ def read_schema(
4038
schema.registers = dict(common.registers, **schema.registers)
4139
if common.bitMasks:
4240
schema.bitMasks = (
43-
common.bitMasks
44-
if schema.bitMasks is None
45-
else dict(common.bitMasks, **schema.bitMasks)
41+
common.bitMasks if schema.bitMasks is None else dict(common.bitMasks, **schema.bitMasks)
4642
)
4743
if common.groupMasks:
4844
schema.groupMasks = (

tests/test_io.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
expected_error=ValueError,
2727
),
2828
DataFileParam(path="data/write_0.bin", expected_address=0, expected_rows=4),
29-
DataFileParam(
30-
path="data/write_0.bin", expected_address=0, expected_rows=4, keep_type=True
31-
),
29+
DataFileParam(path="data/write_0.bin", expected_address=0, expected_rows=4, keep_type=True),
3230
]
3331

3432

@@ -45,10 +43,7 @@ def test_read(dataFile: DataFileParam):
4543
)
4644
assert len(data) == dataFile.expected_rows
4745
if dataFile.keep_type:
48-
assert (
49-
MessageType.__name__ in data.columns
50-
and data[MessageType.__name__].dtype == "category"
51-
)
46+
assert MessageType.__name__ in data.columns and data[MessageType.__name__].dtype == "category"
5247

5348
if dataFile.expected_cols:
5449
for col in dataFile.expected_cols:

0 commit comments

Comments
 (0)