Skip to content

Commit 7c3fd1e

Browse files
committed
chore: pre-commit
1 parent de24866 commit 7c3fd1e

3 files changed

Lines changed: 17 additions & 15 deletions

File tree

tagreader/web_handlers.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -655,9 +655,7 @@ def generate_sql_query(
655655
'dso="CHARINT=N;CHARFLOAT=N;CHARTIME=N;CONVERTERRORS=N" '
656656
f'm="{max_rows}" to="30" s="1">'
657657
)
658-
query = query.replace(
659-
"\t", " "
660-
).replace(
658+
query = query.replace("\t", " ").replace(
661659
"\n", " "
662660
) # Replace new lines and tabs that are typical in formatted SQL queries with spaces.
663661

@@ -845,15 +843,17 @@ def generate_read_query(
845843
if self._is_summary(read_type):
846844
params["selectedFields"] = "Links;Items.Value.Timestamp;Items.Value.Value"
847845
if get_status:
848-
params["selectedFields"] += (
846+
params[
847+
"selectedFields"
848+
] += (
849849
";Items.Value.Good;Items.Value.Questionable;Items.Value.Substituted"
850850
)
851851
elif read_type in [ReaderType.INT, ReaderType.RAW, ReaderType.SHAPEPRESERVING]:
852852
params["selectedFields"] = "Links;Items.Timestamp;Items.Value"
853853
if get_status:
854-
params["selectedFields"] += (
855-
";Items.Good;Items.Questionable;Items.Substituted"
856-
)
854+
params[
855+
"selectedFields"
856+
] += ";Items.Good;Items.Questionable;Items.Substituted"
857857
elif read_type == ReaderType.SNAPSHOT:
858858
params["selectedFields"] = "Timestamp;Value"
859859
if get_status:
@@ -1077,7 +1077,9 @@ def read_tag(
10771077
if get_status:
10781078
df["Status"] = (
10791079
# Values are boolean, but no need to do .astype(int)
1080-
df["Questionable"] + 2 * (1 - df["Good"]) + 4 * df["Substituted"]
1080+
df["Questionable"]
1081+
+ 2 * (1 - df["Good"])
1082+
+ 4 * df["Substituted"]
10811083
)
10821084
df = df.drop(columns=["Good", "Questionable", "Substituted"])
10831085

tests/test_bucketcache.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ def test_fetch(cache: BucketCache) -> None:
464464
end=END_TIME_1 - pd.Timedelta("15m"),
465465
)
466466
pd.testing.assert_frame_equal(
467-
DF1.loc[START_TIME_1 : END_TIME_1 - pd.Timedelta("15m")],
467+
DF1.loc[START_TIME_1 : END_TIME_1 - pd.Timedelta("15m")], # type: ignore[misc]
468468
df_read,
469469
check_freq=False,
470470
)
@@ -541,9 +541,9 @@ def test_store_overlapping_df(cache: BucketCache) -> None:
541541
)
542542
df_expected = pd.concat(
543543
[
544-
DF1[START_TIME_1 : START_TIME_3 - pd.Timedelta(TS, unit="s")],
545-
DF3[START_TIME_3:END_TIME_3],
546-
DF2[END_TIME_3 + pd.Timedelta(TS, unit="s") : END_TIME_2],
544+
DF1[START_TIME_1 : START_TIME_3 - pd.Timedelta(TS, unit="s")], # type: ignore[misc]
545+
DF3[START_TIME_3:END_TIME_3], # type: ignore[misc]
546+
DF2[END_TIME_3 + pd.Timedelta(TS, unit="s") : END_TIME_2], # type: ignore[misc]
547547
]
548548
)
549549

tests/test_cache.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def test_interval_reads(
114114
end=None,
115115
get_status=get_status,
116116
)
117-
pd.testing.assert_frame_equal(data[start:], df_read)
117+
pd.testing.assert_frame_equal(data[start:], df_read) # type: ignore[misc]
118118
df_read = cache.fetch(
119119
tagname="tag1",
120120
read_type=ReaderType.INT,
@@ -123,7 +123,7 @@ def test_interval_reads(
123123
end=end,
124124
get_status=get_status,
125125
)
126-
pd.testing.assert_frame_equal(data[:end], df_read)
126+
pd.testing.assert_frame_equal(data[:end], df_read) # type: ignore[misc]
127127
df_read = cache.fetch(
128128
tagname="tag1",
129129
read_type=ReaderType.INT,
@@ -150,7 +150,7 @@ def test_interval_reads(
150150
end=end,
151151
get_status=get_status,
152152
)
153-
pd.testing.assert_frame_equal(data[start:end], df_read)
153+
pd.testing.assert_frame_equal(data[start:end], df_read) # type: ignore[misc]
154154

155155

156156
def test_store_empty_df(

0 commit comments

Comments
 (0)