Skip to content

Commit 1e37f08

Browse files
authored
Merge pull request #19 from vvanglro/feat/package_version
2 parents 8d18913 + 9cc92c9 commit 1e37f08

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ repos:
66
hooks:
77
- id: check-ast
88
- id: trailing-whitespace
9+
exclude: 'README.md'
910
- id: check-toml
1011
- id: end-of-file-fixer
1112

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ keywords = ["taskiq", "tasks", "distributed", "async", "aio-pika"]
2222
python = "^3.7"
2323
taskiq = ">=0.6.0,<1"
2424
aio-pika = "^9.0"
25+
importlib-metadata = {version = "^4.0.0", python = "<3.8"}
2526

2627
[tool.poetry.dev-dependencies]
2728
pytest = "^7.0"

taskiq_aio_pika/__init__.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
"""Taskiq integration with aio-pika."""
22
from taskiq_aio_pika.broker import AioPikaBroker
33

4+
try:
5+
# Python 3.8+
6+
from importlib.metadata import version # noqa: WPS433
7+
except ImportError:
8+
# Python 3.7
9+
from importlib_metadata import version # noqa: WPS433, WPS440
10+
11+
__version__ = version("taskiq-aio-pika")
12+
413
__all__ = ["AioPikaBroker"]

taskiq_aio_pika/broker.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,21 +226,20 @@ async def kick(self, message: BrokerMessage) -> None:
226226
if self.write_channel is None:
227227
raise ValueError("Please run startup before kicking.")
228228

229-
message_base_params: dict[str, Any] = {
229+
message_base_params: Dict[str, Any] = {
230230
"body": message.message,
231231
"headers": {
232232
"task_id": message.task_id,
233233
"task_name": message.task_name,
234234
**message.labels,
235235
},
236236
"delivery_mode": DeliveryMode.PERSISTENT,
237+
"priority": parse_val(
238+
int,
239+
message.labels.get("priority"),
240+
),
237241
}
238242

239-
message_base_params["priority"] = parse_val(
240-
int,
241-
message.labels.get("priority"),
242-
)
243-
244243
delay: Optional[int] = parse_val(int, message.labels.get("delay"))
245244
rmq_message: Message = Message(**message_base_params)
246245

0 commit comments

Comments
 (0)