Skip to content

Commit 759e72b

Browse files
elena-kolevskaelena-kolevska
committed
Fixes linter
Signed-off-by: Elena Kolevska <elena@kolevska.com> Small cleanups after Copilot review Signed-off-by: Elena Kolevska <elena@kolevska.com> One more linter fix Signed-off-by: Elena Kolevska <elena@kolevska.com> Reformat Signed-off-by: Elena Kolevska <elena@kolevska.com>
1 parent 8ea00b2 commit 759e72b

3 files changed

Lines changed: 55 additions & 22 deletions

File tree

‎redis/commands/core.py‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3831,7 +3831,9 @@ def xadd(
38313831
pieces.extend([b"IDMPAUTO", idmpauto])
38323832
if idmp is not None:
38333833
if not isinstance(idmp, tuple) or len(idmp) != 2:
3834-
raise DataError("XADD idmp must be a tuple of (producer_id, idempotent_id)")
3834+
raise DataError(
3835+
"XADD idmp must be a tuple of (producer_id, idempotent_id)"
3836+
)
38353837
pieces.extend([b"IDMP", idmp[0], idmp[1]])
38363838
if maxlen is not None:
38373839
if not isinstance(maxlen, int) or maxlen < 0:
@@ -3895,14 +3897,22 @@ def xcfgset(
38953897
pieces: list[EncodableT] = []
38963898

38973899
if idmp_duration is not None:
3898-
if not isinstance(idmp_duration, int) or idmp_duration < 1 or idmp_duration > 300:
3900+
if (
3901+
not isinstance(idmp_duration, int)
3902+
or idmp_duration < 1
3903+
or idmp_duration > 300
3904+
):
38993905
raise DataError(
39003906
"XCFGSET idmp_duration must be an integer between 1 and 300"
39013907
)
39023908
pieces.extend([b"IDMP-DURATION", idmp_duration])
39033909

39043910
if idmp_maxsize is not None:
3905-
if not isinstance(idmp_maxsize, int) or idmp_maxsize < 1 or idmp_maxsize > 1000000:
3911+
if (
3912+
not isinstance(idmp_maxsize, int)
3913+
or idmp_maxsize < 1
3914+
or idmp_maxsize > 1000000
3915+
):
39063916
raise DataError(
39073917
"XCFGSET idmp_maxsize must be an integer between 1 and 1,000,000"
39083918
)

‎tests/test_asyncio/test_commands.py‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3961,7 +3961,7 @@ async def test_xinfo_stream_idempotent_fields(self, r: redis.Redis):
39613961
# After adding idempotent entry
39623962
assert info["pids-tracked"] == 1 # One producer tracked
39633963
assert info["iids-tracked"] == 1 # One iid tracked
3964-
assert info["iids-added"] == 1 # One idempotent entry added
3964+
assert info["iids-added"] == 1 # One idempotent entry added
39653965
assert info["iids-duplicates"] == 0 # No duplicates yet
39663966

39673967
# Add duplicate entry
@@ -3971,7 +3971,7 @@ async def test_xinfo_stream_idempotent_fields(self, r: redis.Redis):
39713971
# After duplicate
39723972
assert info["pids-tracked"] == 1 # Still one producer
39733973
assert info["iids-tracked"] == 1 # Still one iid (duplicate doesn't add new)
3974-
assert info["iids-added"] == 1 # Still one unique entry
3974+
assert info["iids-added"] == 1 # Still one unique entry
39753975
assert info["iids-duplicates"] == 1 # One duplicate detected
39763976

39773977
# Add entry from different producer
@@ -3981,7 +3981,7 @@ async def test_xinfo_stream_idempotent_fields(self, r: redis.Redis):
39813981
# After second producer
39823982
assert info["pids-tracked"] == 2 # Two producers tracked
39833983
assert info["iids-tracked"] == 2 # Two iids tracked
3984-
assert info["iids-added"] == 2 # Two unique entries
3984+
assert info["iids-added"] == 2 # Two unique entries
39853985
assert info["iids-duplicates"] == 1 # Still one duplicate
39863986

39873987
@skip_if_server_version_lt("5.0.0")
@@ -4739,22 +4739,30 @@ async def test_xadd_idmp(self, r: redis.Redis):
47394739
stream = "stream"
47404740

47414741
# Test XADD with IDMP - first write
4742-
message_id1 = await r.xadd(stream, {"field1": "value1"}, idmp=("producer1", b"msg1"))
4742+
message_id1 = await r.xadd(
4743+
stream, {"field1": "value1"}, idmp=("producer1", b"msg1")
4744+
)
47434745

47444746
# Test XADD with IDMP - duplicate write returns same ID
4745-
message_id2 = await r.xadd(stream, {"field1": "value1"}, idmp=("producer1", b"msg1"))
4747+
message_id2 = await r.xadd(
4748+
stream, {"field1": "value1"}, idmp=("producer1", b"msg1")
4749+
)
47464750
assert message_id1 == message_id2
47474751

47484752
# Test XADD with IDMP - different iid creates new entry
4749-
message_id3 = await r.xadd(stream, {"field1": "value1"}, idmp=("producer1", b"msg2"))
4753+
message_id3 = await r.xadd(
4754+
stream, {"field1": "value1"}, idmp=("producer1", b"msg2")
4755+
)
47504756
assert message_id3 != message_id1
47514757

47524758
# Test XADD with IDMP - different producer creates new entry
4753-
message_id4 = await r.xadd(stream, {"field1": "value1"}, idmp=("producer2", b"msg1"))
4759+
message_id4 = await r.xadd(
4760+
stream, {"field1": "value1"}, idmp=("producer2", b"msg1")
4761+
)
47544762
assert message_id4 != message_id1
47554763

47564764
# Test XADD with IDMP - shorter binary iid
4757-
message_id5 = await r.xadd(stream, {"field1": "value1"}, idmp=("producer1", b"\x01"))
4765+
await r.xadd(stream, {"field1": "value1"}, idmp=("producer1", b"\x01"))
47584766

47594767
# Verify stream has 4 entries
47604768
assert await r.xlen(stream) == 4
@@ -4765,15 +4773,24 @@ async def test_xadd_idmp_validation(self, r: redis.Redis):
47654773

47664774
# Test error: both idmpauto and idmp specified
47674775
with pytest.raises(redis.DataError):
4768-
await r.xadd(stream, {"foo": "bar"}, idmpauto="producer1", idmp=("producer1", b"msg1"))
4776+
await r.xadd(
4777+
stream,
4778+
{"foo": "bar"},
4779+
idmpauto="producer1",
4780+
idmp=("producer1", b"msg1"),
4781+
)
47694782

47704783
# Test error: idmpauto with explicit id
47714784
with pytest.raises(redis.DataError):
4772-
await r.xadd(stream, {"foo": "bar"}, id="1234567890-0", idmpauto="producer1")
4785+
await r.xadd(
4786+
stream, {"foo": "bar"}, id="1234567890-0", idmpauto="producer1"
4787+
)
47734788

47744789
# Test error: idmp with explicit id
47754790
with pytest.raises(redis.DataError):
4776-
await r.xadd(stream, {"foo": "bar"}, id="1234567890-0", idmp=("producer1", b"msg1"))
4791+
await r.xadd(
4792+
stream, {"foo": "bar"}, id="1234567890-0", idmp=("producer1", b"msg1")
4793+
)
47774794

47784795
# Test error: idmp not a tuple
47794796
with pytest.raises(redis.DataError):

‎tests/test_commands.py‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5610,7 +5610,7 @@ def test_xinfo_stream_idempotent_fields(self, r):
56105610
# After adding idempotent entry
56115611
assert info["pids-tracked"] == 1 # One producer tracked
56125612
assert info["iids-tracked"] == 1 # One iid tracked
5613-
assert info["iids-added"] == 1 # One idempotent entry added
5613+
assert info["iids-added"] == 1 # One idempotent entry added
56145614
assert info["iids-duplicates"] == 0 # No duplicates yet
56155615

56165616
# Add duplicate entry
@@ -5620,7 +5620,7 @@ def test_xinfo_stream_idempotent_fields(self, r):
56205620
# After duplicate
56215621
assert info["pids-tracked"] == 1 # Still one producer
56225622
assert info["iids-tracked"] == 1 # Still one iid (duplicate doesn't add new)
5623-
assert info["iids-added"] == 1 # Still one unique entry
5623+
assert info["iids-added"] == 1 # Still one unique entry
56245624
assert info["iids-duplicates"] == 1 # One duplicate detected
56255625

56265626
# Add entry from different producer
@@ -5630,7 +5630,7 @@ def test_xinfo_stream_idempotent_fields(self, r):
56305630
# After second producer
56315631
assert info["pids-tracked"] == 2 # Two producers tracked
56325632
assert info["iids-tracked"] == 2 # Two iids tracked
5633-
assert info["iids-added"] == 2 # Two unique entries
5633+
assert info["iids-added"] == 2 # Two unique entries
56345634
assert info["iids-duplicates"] == 1 # Still one duplicate
56355635

56365636
@skip_if_server_version_lt("5.0.0")
@@ -6421,7 +6421,7 @@ def test_xadd_with_options(self, r):
64216421
def test_xadd_idmpauto(self, r):
64226422
stream = "stream"
64236423

6424-
# Test XADD with IDMPAUTO - first write
6424+
# XADD with IDMPAUTO - first write
64256425
message_id1 = r.xadd(stream, {"field1": "value1"}, idmpauto="producer1")
64266426

64276427
# Test XADD with IDMPAUTO - duplicate write returns same ID
@@ -6459,8 +6459,7 @@ def test_xadd_idmp(self, r):
64596459
assert message_id4 != message_id1
64606460

64616461
# Test XADD with IDMP - shorter binary iid
6462-
message_id5 = r.xadd(stream, {"field1": "value1"}, idmp=("producer1", b"\x01"))
6463-
assert re.match(rb"[0-9]+\-[0-9]+", message_id5)
6462+
r.xadd(stream, {"field1": "value1"}, idmp=("producer1", b"\x01"))
64646463

64656464
# Verify stream has 4 entries
64666465
assert r.xlen(stream) == 4
@@ -6471,15 +6470,22 @@ def test_xadd_idmp_validation(self, r):
64716470

64726471
# Test error: both idmpauto and idmp specified
64736472
with pytest.raises(redis.DataError):
6474-
r.xadd(stream, {"foo": "bar"}, idmpauto="producer1", idmp=("producer1", b"msg1"))
6473+
r.xadd(
6474+
stream,
6475+
{"foo": "bar"},
6476+
idmpauto="producer1",
6477+
idmp=("producer1", b"msg1"),
6478+
)
64756479

64766480
# Test error: idmpauto with explicit id
64776481
with pytest.raises(redis.DataError):
64786482
r.xadd(stream, {"foo": "bar"}, id="1234567890-0", idmpauto="producer1")
64796483

64806484
# Test error: idmp with explicit id
64816485
with pytest.raises(redis.DataError):
6482-
r.xadd(stream, {"foo": "bar"}, id="1234567890-0", idmp=("producer1", b"msg1"))
6486+
r.xadd(
6487+
stream, {"foo": "bar"}, id="1234567890-0", idmp=("producer1", b"msg1")
6488+
)
64836489

64846490
# Test error: idmp not a tuple
64856491
with pytest.raises(redis.DataError):

0 commit comments

Comments
 (0)
⚡