From e9697cc888bb3bf922c685406abbe681bd3c7edb Mon Sep 17 00:00:00 2001 From: Jack Leow Date: Mon, 7 Oct 2024 09:51:11 -0700 Subject: [PATCH 1/5] Updated BrokerMetadata#nodeId type from int to (int | str). --- aiokafka/structs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aiokafka/structs.py b/aiokafka/structs.py index 3db1d20a..748243cc 100644 --- a/aiokafka/structs.py +++ b/aiokafka/structs.py @@ -1,6 +1,6 @@ from collections.abc import Sequence from dataclasses import dataclass -from typing import Generic, NamedTuple, Optional, TypeVar +from typing import Generic, List, NamedTuple, Optional, Sequence, Tuple, TypeVar, Union from aiokafka.errors import KafkaError @@ -27,7 +27,7 @@ class TopicPartition(NamedTuple): class BrokerMetadata(NamedTuple): """A Kafka broker metadata used by admin tools""" - nodeId: int + nodeId: Union[int, str] "The Kafka broker id" host: str From 867069fd8c07515f7934aa0d73f8b204d0f88da8 Mon Sep 17 00:00:00 2001 From: Jack Leow Date: Sat, 2 Nov 2024 20:47:36 -0700 Subject: [PATCH 2/5] FIXME. --- aiokafka/structs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/aiokafka/structs.py b/aiokafka/structs.py index 748243cc..f89f25a5 100644 --- a/aiokafka/structs.py +++ b/aiokafka/structs.py @@ -1,6 +1,7 @@ +from __future__ import annotations from collections.abc import Sequence from dataclasses import dataclass -from typing import Generic, List, NamedTuple, Optional, Sequence, Tuple, TypeVar, Union +from typing import Generic, NamedTuple, Optional, Sequence, TypeVar from aiokafka.errors import KafkaError @@ -27,7 +28,7 @@ class TopicPartition(NamedTuple): class BrokerMetadata(NamedTuple): """A Kafka broker metadata used by admin tools""" - nodeId: Union[int, str] + nodeId: int | str # FIXME consider updating implementation "The Kafka broker id" host: str From 5cbe7aba119a37ee79ed3d26dc2e3bd74990ecd4 Mon Sep 17 00:00:00 2001 From: Jack Leow Date: Sun, 3 Nov 2024 01:24:43 -0700 Subject: [PATCH 3/5] Unused import. --- aiokafka/structs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aiokafka/structs.py b/aiokafka/structs.py index f89f25a5..dc218dfa 100644 --- a/aiokafka/structs.py +++ b/aiokafka/structs.py @@ -1,7 +1,7 @@ from __future__ import annotations from collections.abc import Sequence from dataclasses import dataclass -from typing import Generic, NamedTuple, Optional, Sequence, TypeVar +from typing import Generic, NamedTuple, Optional, TypeVar from aiokafka.errors import KafkaError From 5797fb8c3bf1f5c36549ac97a6b5d4bebf98d13e Mon Sep 17 00:00:00 2001 From: Jack Leow Date: Sun, 3 Nov 2024 01:26:06 -0700 Subject: [PATCH 4/5] Include issue link in FIXME. --- aiokafka/structs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aiokafka/structs.py b/aiokafka/structs.py index dc218dfa..ad6cc7d7 100644 --- a/aiokafka/structs.py +++ b/aiokafka/structs.py @@ -28,7 +28,7 @@ class TopicPartition(NamedTuple): class BrokerMetadata(NamedTuple): """A Kafka broker metadata used by admin tools""" - nodeId: int | str # FIXME consider updating implementation + nodeId: int | str # FIXME consider updating implementation (https://github.com/aio-libs/aiokafka/issues/1050) "The Kafka broker id" host: str From db572e3c1a7e492ec5c52becde2de45fc8ca08c3 Mon Sep 17 00:00:00 2001 From: Denis Otkidach Date: Sat, 16 Nov 2024 09:17:37 +0200 Subject: [PATCH 5/5] Fix linter errors --- aiokafka/structs.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/aiokafka/structs.py b/aiokafka/structs.py index ad6cc7d7..8c836e39 100644 --- a/aiokafka/structs.py +++ b/aiokafka/structs.py @@ -1,4 +1,5 @@ from __future__ import annotations + from collections.abc import Sequence from dataclasses import dataclass from typing import Generic, NamedTuple, Optional, TypeVar @@ -28,7 +29,8 @@ class TopicPartition(NamedTuple): class BrokerMetadata(NamedTuple): """A Kafka broker metadata used by admin tools""" - nodeId: int | str # FIXME consider updating implementation (https://github.com/aio-libs/aiokafka/issues/1050) + # FIXME: consider updating implementation (https://github.com/aio-libs/aiokafka/issues/1050) + nodeId: int | str "The Kafka broker id" host: str