From b30a45f9ec7cccdbb8151127916ffd6f583a40b1 Mon Sep 17 00:00:00 2001 From: tonyrewin Date: Tue, 31 Jan 2023 10:07:04 +0300 Subject: [PATCH] upgrade-ws --- main.py | 24 ++++++++++++------------ requirements.txt | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/main.py b/main.py index f01bdc11..43f4cd46 100644 --- a/main.py +++ b/main.py @@ -21,9 +21,9 @@ from services.stat.viewed import ViewedStorage from services.zine.gittask import GitTask from settings import DEV_SERVER_PID_FILE_NAME, SENTRY_DSN # from sse.transport import GraphQLSSEHandler -# from services.inbox.presence import on_connect, on_disconnect -from services.inbox.sse import sse_messages - +from services.inbox.presence import on_connect, on_disconnect +# from services.inbox.sse import sse_messages +from ariadne.asgi.handlers import GraphQLTransportWSHandler import_module("resolvers") schema = make_executable_schema(load_schema_from_path("schema.graphql"), resolvers) # type: ignore @@ -66,7 +66,7 @@ async def shutdown(): routes = [ - Route("/messages", endpoint=sse_messages), + # Route("/messages", endpoint=sse_messages), Route("/oauth/{provider}", endpoint=oauth_login), Route("/oauth-authorize", endpoint=oauth_authorize), Route("/confirm/{token}", endpoint=confirm_email_handler) @@ -82,10 +82,10 @@ app = Starlette( app.mount("/", GraphQL( schema, debug=True, - # websocket_handler=GraphQLTransportWSHandler( - # on_connect=on_connect, - # on_disconnect=on_disconnect - # ) + websocket_handler=GraphQLTransportWSHandler( + on_connect=on_connect, + on_disconnect=on_disconnect + ) )) dev_app = app = Starlette( @@ -98,8 +98,8 @@ dev_app = app = Starlette( dev_app.mount("/", GraphQL( schema, debug=True, - # websocket_handler=GraphQLTransportWSHandler( - # on_connect=on_connect, - # on_disconnect=on_disconnect - # ) + websocket_handler=GraphQLTransportWSHandler( + on_connect=on_connect, + on_disconnect=on_disconnect + ) )) diff --git a/requirements.txt b/requirements.txt index 69f5c1e8..bae574cd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ python-frontmatter~=1.0.0 aioredis~=2.0.1 aiohttp -ariadne>=0.16.0 +ariadne>=0.17.0 PyYAML>=5.4 pyjwt>=2.6.0 -starlette~=0.20.4 +starlette~=0.23.1 sqlalchemy>=1.4.41 graphql-core>=3.0.3 gql @@ -27,5 +27,5 @@ python-dateutil~=2.8.2 beautifulsoup4~=4.11.1 lxml sentry-sdk>=0.10.2 -sse_starlette +# sse_starlette graphql-ws