Better abstractions

.devcontainer/Dockerfile

@@ -28,8 +28,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
 # Python and uv installation
 USER $USER
 ARG HOME="/home/$USER"
-ARG PYTHON_VERSION=3.9
-# ARG PYTHON_VERSION=3.10
+ARG PYTHON_VERSION=3.10
 
 ENV PYENV_ROOT="${HOME}/.pyenv"
 ENV PATH="${PYENV_ROOT}/shims:${PYENV_ROOT}/bin:${HOME}/.local/bin:$PATH"

.devcontainer/devcontainer.json

@@ -7,12 +7,14 @@
 		"rabbitmq:15672"
 	],
 	"containerEnv": {
-		"AMQP_URI": "amqp://guest:guest@rabbitmq/"
+		"AMQP_URI": "amqp://guest:guest@rabbitmq/",
+		"PYTEST_AMQP_URI": "amqp://guest:guest@rabbitmq/"
 	},
 	"customizations": {
 		"vscode": {
 			"extensions": [
 				"ms-python.python",
+				"ms-pyright.pyright",
 				"njpwerner.autodocstring",
 				"tamasfe.even-better-toml",
 				"ms-python.mypy-type-checker",
@@ -26,6 +28,21 @@
 			],
 			"settings": {
 				"python.defaultInterpreterPath": "/workspaces/${localWorkspaceFolderBasename}/.venv/bin/python",
+				"python.analysis.typeCheckingMode": "strict",
+				"python.analysis.autoImportCompletions": true,
+				"python.analysis.diagnosticMode": "workspace",
+				"python.analysis.autoSearchPaths": true,
+				"python.analysis.extraPaths": [
+					"./src"
+				],
+				"python.analysis.include": [
+					"src/**",
+					"*.py"
+				],
+				"python.analysis.stubPath": "./src",
+				"python.linting.enabled": true,
+				"python.linting.pylintEnabled": false,
+				"python.linting.mypyEnabled": false,
 				"yaml.schemas": {
 					"https://asyncapi.com/schema-store/3.0.0-without-$id.json": [
 						"file:///workspaces/asyncapi-python/examples/*.yaml"
@@ -40,9 +57,17 @@
 					"amqp",
 					"venv",
 					"jsonschema",
-					"fanout"
+					"fanout",
+					"anypointmq",
+					"googlepubsub",
+					"ibmmq",
+					"mqtt"
 				]
 			}
 		}
+	},
+	"features": {
+		"ghcr.io/devcontainers/features/github-cli:1": {},
+		"ghcr.io/devcontainers/features/node:1": {}
 	}
 }

.github/workflows/release.yml

@@ -6,7 +6,8 @@ permissions:
 
 on:
   push:
-    tags: "v*.*.*"
+    tags: 
+      - "v*.*.*"
 
 jobs:
   test:
@@ -25,7 +26,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.9"
+          python-version: "3.10"
 
       - name: Install UV
         uses: astral-sh/setup-uv@v3
@@ -56,7 +57,7 @@ jobs:
           tag_name: ${{ github.ref }}
           release_name: ${{ github.ref }}
           draft: true
-          prerelease: false
+          prerelease: ${{ contains(github.ref, 'rc') }}
 
       - name: Build sdist, wheel, and pex
         run: >

.github/workflows/test.yml

@@ -9,17 +9,67 @@ on:
   workflow_call:
 
 jobs:
+  black:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
+      - name: Install UV
+        uses: astral-sh/setup-uv@v3
+        with:
+          enable-cache: true
+
+      - name: Install dependencies
+        run: uv sync --all-extras
+
+      - name: Check code formatting with Black
+        run: uv run black --check --diff --color src/ tests/
+
+  pyright:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
+      - name: Install UV
+        uses: astral-sh/setup-uv@v3
+        with:
+          enable-cache: true
+
+      - name: Install dependencies
+        run: uv sync --all-extras
+
+      - name: Run PyRight type checking
+        run: |
+          uv run pyright src/asyncapi_python
+          uv run pyright src/asyncapi_python_codegen
+
   test:
     runs-on: ubuntu-latest
 
     strategy:
         matrix:
-          python_version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+          python_version: ["3.10", "3.11", "3.12", "3.13"]
 
     services:
       rabbitmq:
         image: rabbitmq:3.13.6
-        ports: ["5672"]
+        ports:
+          - 5672:5672
+        options: >-
+          --health-cmd "rabbitmq-diagnostics -q ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
 
     steps:
       - uses: actions/checkout@v4
@@ -37,7 +87,12 @@ jobs:
       - name: Install dependencies
         run: uv sync --all-extras
 
+      - name: Wait for RabbitMQ to be ready
+        run: |
+          timeout 60s bash -c 'until nc -z localhost 5672; do sleep 1; done'
+          sleep 5  # Additional wait to ensure RabbitMQ is fully initialized
+
       - name: Run tests
         env:
-          AMQP_URI: amqp://localhost:${{ job.services.rabbitmq.ports[5672] }}
+          PYTEST_AMQP_URI: amqp://guest:guest@localhost:5672/
         run: uv run pytest

README.md

@@ -29,7 +29,7 @@ Easily generate type-safe and async Python applications from AsyncAPI 3 specific
 
 ## Requirements
 
-- `python>=3.9`
+- `python>=3.10`
 - `pydantic>=2`
 - `pytz`
 - For `codegen` extra

examples/amqp-pub-sub/.gitignore

@@ -1,2 +1,6 @@
+# Generated code directories
 publisher/
 subscriber/
+
+# Virtual environment
+.venv/

examples/amqp-pub-sub/Makefile

@@ -9,19 +9,19 @@ venv:
 	python3 -m venv $(VENV_NAME)
 
 install:
-	$(PIP) install asyncapi-python[amqp,codegen]==$(PACKAGE_VERSION)
+	$(PIP) install -e ../../[amqp,codegen]
 
 generate:
 	$(CODEGEN) spec/subscriber.asyncapi.yaml subscriber --force
 	$(CODEGEN) spec/publisher.asyncapi.yaml publisher --force
 
 client:
-	$(PYTHON) main-subscriber.py
+	$(PYTHON) main-publisher.py
 
 server: 
-	$(PYTHON) main-publisher.py
+	$(PYTHON) main-subscriber.py
 
 clean:
 	rm -rf $(VENV_NAME)
 
-.PHONY: client server
+.PHONY: client server

examples/amqp-pub-sub/main-publisher.py

@@ -1,21 +1,23 @@
 import asyncio
 from os import environ
 from publisher import Application
-from publisher.messages import Ping
+from publisher.messages.json import Ping
+from asyncapi_python.contrib.wire.amqp import AmqpWire
 
 
 AMQP_URI = environ.get("AMQP_URI", "amqp://guest:guest@localhost")
 NUM_REQUESTS = 3
 
-app = Application(AMQP_URI)
+app = Application(AmqpWire(AMQP_URI))
 
 
 async def main() -> None:
-    await app.start(blocking=False)
+    await app.start()
     for _ in range(NUM_REQUESTS):
         req = Ping()
         print(f"Sending request: {req}")
-        await app.producer.application.ping(req)
+        await app.producer.application_ping(req)
+    await app.stop()
 
 
 if __name__ == "__main__":

examples/amqp-pub-sub/main-subscriber.py

@@ -2,17 +2,18 @@
 from os import environ
 from sys import exit
 from subscriber import Application
-from subscriber.messages import Ping
+from subscriber.messages.json import Ping
+from asyncapi_python.contrib.wire.amqp import AmqpWire
 
 
 AMQP_URI = environ.get("AMQP_URI", "amqp://guest:guest@localhost")
 MAX_REQUESTS = 3
 request_count = 0
 
-app = Application(AMQP_URI)
+app = Application(AmqpWire(AMQP_URI))
 
 
-@app.consumer.application.ping
+@app.consumer.application_ping
 async def handle_ping_request(msg: Ping) -> None:
     global request_count
     print(f"Handling request: {msg}")
@@ -24,13 +25,14 @@ async def termination_handler():
     while True:
         await asyncio.sleep(1)
         if request_count >= MAX_REQUESTS:
+            await app.stop()
             exit(0)
 
 
 async def main() -> None:
-    app_handler = app.start(blocking=True)
-    term_handler = termination_handler()
-    await asyncio.gather(app_handler, term_handler)
+    await app.start()
+    # Keep running until termination_handler exits
+    await termination_handler()
 
 
 if __name__ == "__main__":

examples/amqp-rpc/.gitignore

@@ -1,2 +1,6 @@
+# Generated code directories
 client/
 server/
+
+# Virtual environment
+.venv/

examples/amqp-rpc/Makefile

@@ -9,7 +9,7 @@ venv:
 	python3 -m venv $(VENV_NAME)
 
 install:
-	$(PIP) install asyncapi-python[amqp,codegen]==$(PACKAGE_VERSION)
+	$(PIP) install -e ../../[amqp,codegen]
 
 generate:
 	$(CODEGEN) spec/client.asyncapi.yaml client --force
@@ -24,4 +24,4 @@ server:
 clean:
 	rm -rf $(VENV_NAME)
 
-.PHONY: client server
+.PHONY: client server

examples/amqp-rpc/main-client.py

@@ -1,22 +1,24 @@
 import asyncio
 from os import environ
 from client import Application
-from client.messages import Ping, Pong
+from client.messages.json import Ping, Pong
+from asyncapi_python.contrib.wire.amqp import AmqpWire
 
 
 AMQP_URI = environ.get("AMQP_URI", "amqp://guest:guest@localhost")
 NUM_REQUESTS = 3
 
-app = Application(AMQP_URI)
+app = Application(AmqpWire(AMQP_URI))
 
 
 async def main() -> None:
-    await app.start(blocking=False)
+    await app.start()
     for _ in range(NUM_REQUESTS):
         req = Ping()
         print(f"Sending request: {req}")
-        res: Pong = await app.producer.ping_request(req)
+        res: Pong = await app.producer.pingrequest(req)
         print(f"Got response: {res}")
+    await app.stop()
 
 
 if __name__ == "__main__":

examples/amqp-rpc/main-server.py

@@ -2,17 +2,18 @@
 from os import environ
 from sys import exit
 from server import Application
-from server.messages import Ping, Pong
+from server.messages.json import Ping, Pong
+from asyncapi_python.contrib.wire.amqp import AmqpWire
 
 
 AMQP_URI = environ.get("AMQP_URI", "amqp://guest:guest@localhost")
 MAX_REQUESTS = 3
 request_count = 0
 
-app = Application(AMQP_URI)
+app = Application(AmqpWire(AMQP_URI))
 
 
-@app.consumer.on_ping_request
+@app.consumer.onpingrequest
 async def handle_ping_request(msg: Ping) -> Pong:
     global request_count
     print(f"Handling request: {msg}")
@@ -27,13 +28,14 @@ async def termination_handler():
     while True:
         await asyncio.sleep(1)
         if request_count >= MAX_REQUESTS:
+            await app.stop()
             exit(0)
 
 
 async def main() -> None:
-    app_handler = app.start(blocking=True)
-    term_handler = termination_handler()
-    await asyncio.gather(app_handler, term_handler)
+    await app.start()
+    # Keep running until termination_handler exits
+    await termination_handler()
 
 
 if __name__ == "__main__":

examples/amqp-work-queue/.gitignore

@@ -0,0 +1,6 @@
+# Generated code directories
+producer/
+worker/
+
+# Virtual environment
+.venv/