Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: Publish
on:
push:
tags: ["*"]
permissions:
id-token: write
contents: read
jobs:
publish:
name: Publish
Expand All @@ -14,5 +17,3 @@ jobs:
run: uv build --all-packages
- name: Publish
run: uv publish
env:
UV_PUBLISH_TOKEN: ${{ secrets.UV_PUBLISH_TOKEN }}
5 changes: 4 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
branches: main
pull_request:
branches: main
permissions:
contents: read
id-token: write
env:
FORCE_COLOR: 1
jobs:
Expand Down Expand Up @@ -52,4 +55,4 @@ jobs:
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v5
with:
token: ${{ secrets.CODECOV_TOKEN }}
use_oidc: true
11 changes: 5 additions & 6 deletions packages/asyncfast/src/asyncfast/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import asyncio
import inspect
import json
import re
from collections import Counter
from collections.abc import AsyncGenerator
Expand Down Expand Up @@ -689,11 +688,11 @@ def _generate_payload(
) -> Generator[tuple[str, Any], None, None]:
if self.payload:
name, field = self.payload
payload = message_receive_event.get("payload")
payload_obj = None if payload is None else json.loads(payload)
value = field.type_adapter.validate_python(
payload_obj, from_attributes=True
)
payload: bytes | None = message_receive_event.get("payload")
if payload is None:
value = field.type_adapter.validate_python(None)
else:
value = field.type_adapter.validate_json(payload)
yield name, value

def _generate_bindings(
Expand Down
31 changes: 31 additions & 0 deletions packages/asyncfast/tests_asyncfast/test_message.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,37 @@ async def topic_handler(payload: MessagePayload) -> None:
test_mock.assert_called_once_with(MessagePayload(id=1))


async def test_message_payload_optional() -> None:
app = AsyncFast()

class MessagePayload(BaseModel):
id: int

test_mock = Mock()

@app.channel("topic")
async def topic_handler(payload: MessagePayload | None) -> None:
test_mock(payload)

message_scope: MessageScope = {
"type": "message",
"amgi": {"version": "1.0", "spec_version": "1.0"},
"address": "topic",
}
message_receive_event: MessageReceiveEvent = {
"type": "message.receive",
"id": "id-1",
"headers": [],
}
await app(
message_scope,
AsyncMock(side_effect=[message_receive_event]),
AsyncMock(),
)

test_mock.assert_called_once_with(None)


async def test_message_payload_sync() -> None:
app = AsyncFast()

Expand Down