From 0b8aee4719cb26e01202e0abcbbdb95a8936fb3d Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 9 Feb 2026 21:53:48 +0100 Subject: [PATCH] use async client, upgrade drf, change api urls --- app/asgi.sh | 2 +- poetry.lock | 10 +++++----- pyproject.toml | 2 +- teleforma/models/core.py | 6 +++--- teleforma/urls.py | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/asgi.sh b/app/asgi.sh index 12705d9b..da28f045 100755 --- a/app/asgi.sh +++ b/app/asgi.sh @@ -14,5 +14,5 @@ if [ "$1" = "--runserver" ]; then python $manage runserver 0.0.0.0:8000 else rm $sock - uvicorn asgi:application --uds $sock --log-level $loglevel --workers $workers --ws websockets + uvicorn asgi:application --uds $sock --log-level $loglevel --workers $workers --ws websockets --reload fi diff --git a/poetry.lock b/poetry.lock index 83e046d6..97f5a51f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -864,17 +864,17 @@ user-agents = "*" [[package]] name = "djangorestframework" -version = "3.13.1" +version = "3.14.0" description = "Web APIs for Django, made easy." optional = false python-versions = ">=3.6" files = [ - {file = "djangorestframework-3.13.1-py3-none-any.whl", hash = "sha256:24c4bf58ed7e85d1fe4ba250ab2da926d263cd57d64b03e8dcef0ac683f8b1aa"}, - {file = "djangorestframework-3.13.1.tar.gz", hash = "sha256:0c33407ce23acc68eca2a6e46424b008c9c02eceb8cf18581921d0092bc1f2ee"}, + {file = "djangorestframework-3.14.0-py3-none-any.whl", hash = "sha256:eb63f58c9f218e1a7d064d17a70751f528ed4e1d35547fdade9aaf4cd103fd08"}, + {file = "djangorestframework-3.14.0.tar.gz", hash = "sha256:579a333e6256b09489cbe0a067e66abe55c6595d8926be6b99423786334350c8"}, ] [package.dependencies] -django = ">=2.2" +django = ">=3.0" pytz = "*" [[package]] @@ -2678,4 +2678,4 @@ testing = ["coverage[toml]", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "c30d4c3ca51024171a0afd7949e46cb6d7fe355554c68606fce5681e027a16ef" +content-hash = "4062afc0dfb832228eb01c654c916e75a7bc19351d231f6a3e5ab87ccd2eea31" diff --git a/pyproject.toml b/pyproject.toml index 3200bea4..e93092a4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,7 @@ channels = "3.0.4" channels-redis = "3.4.0" docutils = "0.17.1" django = "3.2.25" -djangorestframework = "3.13.1" +djangorestframework = "3.14.0" django-debug-toolbar = "3.2.1" dj-pagination = "2.5.0" django-jazzmin = "2.4.7" diff --git a/teleforma/models/core.py b/teleforma/models/core.py index 0c1f61ec..d4b081ab 100644 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -495,7 +495,7 @@ class Conference(models.Model): if settings.DEBUG: requests.post(f"{settings.CHANNEL_URL}{reverse('teleforma-live-conference-notify')}", {'id': self.id}) else: - transport = httpx.HTTPTransport(uds=settings.CHANNEL_URL) + transport = httpx.AsyncHTTPTransport(uds=settings.CHANNEL_URL) async with httpx.AsyncClient(transport=transport) as client: response = await client.post("http://channels" + reverse('teleforma-live-conference-notify-async'), data={'id': self.id}, timeout=20.0) @@ -511,9 +511,9 @@ class Conference(models.Model): else: transport = httpx.HTTPTransport(uds=settings.CHANNEL_URL) with httpx.Client(transport=transport) as client: - response = client.post("http://localhost" + reverse('teleforma-live-conference-notify'), + response = client.post("http://channels" + reverse('teleforma-live-conference-notify-async'), data={'id': self.id}, timeout=120.0) - assert response.status_code == 200 + #assert response.status_code == 200 self.notified_live = True self.save() diff --git a/teleforma/urls.py b/teleforma/urls.py index 2080b8d3..e433d7f9 100644 --- a/teleforma/urls.py +++ b/teleforma/urls.py @@ -286,11 +286,11 @@ urlpatterns = [ NotificationView.as_view(), name='teleforma-notification'), # must be called on channels instance - path('live_conference_notify', + path(r'api/live_conference_notify', LiveConferenceNotify.as_view(), name='teleforma-live-conference-notify'), # must be called on channels instance - path('live_conference_notify_async', + path(r'api/live_conference_notify_async', LiveConferenceNotifyAsync.as_view(), name='teleforma-live-conference-notify-async'), # QUIZ -- 2.39.5