Improved codebase. Isolated modules (aiohttp, gevent) so they don’t collide

Author: syrusakbary

README.md

@@ -21,10 +21,15 @@ python aio.py
 
 ## Setup
 
-For setting up, just plug into your AioHTTP server.
+### aiohttp
+
+For setting up, just plug into your aiohttp server.
 
 ```python
-subscription_server = WebSocketSubscriptionServer(schema)
+from graphql_ws.aiohttp import AiohttpSubscriptionServer
+
+
+subscription_server = AiohttpSubscriptionServer(schema)
 
 async def subscriptions(request):
     ws = web.WebSocketResponse(protocols=('graphql-ws',))
@@ -63,3 +68,41 @@ class Subscription(graphene.ObjectType):
 
 schema = graphene.Schema(query=Query, subscription=Subscription)
 ```
+
+
+### Gevent
+
+For setting up, just plug into your Gevent server.
+
+```python
+subscription_server = GeventSubscriptionServer(schema)
+app.app_protocol = lambda environ_path_info: 'graphql-ws'
+
+@sockets.route('/subscriptions')
+def echo_socket(ws):
+    subscription_server.handle(ws)
+    return []
+```
+
+And then, plug into a subscribable schema:
+
+```python
+import graphene
+from rx import Observable
+
+
+class Query(graphene.ObjectType):
+    base = graphene.String()
+
+
+class Subscription(graphene.ObjectType):
+    count_seconds = graphene.Float(up_to=graphene.Int())
+
+    async def resolve_count_seconds(root, info, up_to=5):
+        return Observable.interval(1000)\
+                         .map(lambda i: "{0}".format(i))\
+                         .take_while(lambda i: int(i) <= up_to)
+
+
+schema = graphene.Schema(query=Query, subscription=Subscription)
+```

examples/__init__.py examples/aiohttp/__init__.pyexamples/__init__.py renamed to examples/aiohttp/__init__.py

@@ -1,9 +1,11 @@
-from aiohttp import web, WSMsgType
-from template import render_graphiql
+import json
+
+from aiohttp import web
 from schema import schema
 from graphql import format_error
-import json
-from graphql_ws import WebSocketSubscriptionServer
+from graphql_ws.aiohttp import AiohttpSubscriptionServer
+
+from template import render_graphiql
 
 
 async def graphql_view(request):
@@ -21,27 +23,14 @@ async def graphql_view(request):
 async def graphiql_view(request):
     return web.Response(text=render_graphiql(), headers={'Content-Type': 'text/html'})
 
-subscription_server = WebSocketSubscriptionServer(schema)
+subscription_server = AiohttpSubscriptionServer(schema)
 
 
 async def subscriptions(request):
     ws = web.WebSocketResponse(protocols=('graphql-ws',))
     await ws.prepare(request)
 
     await subscription_server.handle(ws)
-
-    # async for msg in ws:
-    #     if msg.type == WSMsgType.TEXT:
-    #         if msg.data == 'close':
-    #             await ws.close()
-    #         else:
-    #             await ws.send_str(msg.data + '/answer')
-    #     elif msg.type == WSMsgType.ERROR:
-    #         print('ws connection closed with exception %s' %
-    #               ws.exception())
-
-    # print('websocket connection closed')
-
     return ws
 
 

examples/aio.py examples/aiohttp/app.pyexamples/aio.py renamed to examples/aiohttp/app.py

@@ -0,0 +1,3 @@
+graphql_ws
+aiohttp>=2.1.0
+graphene>=2.0

examples/aiohttp/requirements.txt

@@ -0,0 +1,34 @@
+import random
+import asyncio
+import graphene
+
+
+class Query(graphene.ObjectType):
+    base = graphene.String()
+
+
+class RandomType(graphene.ObjectType):
+    seconds = graphene.Int()
+    random_int = graphene.Int()
+
+
+class Subscription(graphene.ObjectType):
+    count_seconds = graphene.Float(up_to=graphene.Int())
+    random_int = graphene.Field(RandomType)
+
+    async def resolve_count_seconds(root, info, up_to=5):
+        for i in range(up_to):
+            print("YIELD SECOND", i)
+            yield i
+            await asyncio.sleep(1.)
+        yield up_to
+
+    async def resolve_random_int(root, info):
+        i = 0
+        while True:
+            yield RandomType(seconds=i, random_int=random.randint(0, 500))
+            await asyncio.sleep(1.)
+            i += 1
+
+
+schema = graphene.Schema(query=Query, subscription=Subscription)

examples/aiohttp/schema.py

@@ -1,43 +1,13 @@
 import json
 
-import graphene
 from flask import Flask, make_response
 from flask_graphql import GraphQLView
 from flask_sockets import Sockets
-from rx import Observable
-
-from graphql_ws import GeventSubscriptionServer
-from template import render_graphiql
-
-
-class Query(graphene.ObjectType):
-    base = graphene.String()
-
-
-class RandomType(graphene.ObjectType):
-    seconds = graphene.Int()
-    random_int = graphene.Int()
-
-
-class Subscription(graphene.ObjectType):
-
-    count_seconds = graphene.Int(up_to=graphene.Int())
-
-    random_int = graphene.Field(RandomType)
-
-
-    def resolve_count_seconds(root, info, up_to):
-        return Observable.interval(1000)\
-                         .map(lambda i: "{0}".format(i))\
-                         .take_while(lambda i: int(i) <= up_to)
-
-    def resolve_random_int(root, info):
-        import random
-        return Observable.interval(1000).map(lambda i: RandomType(seconds=i, random_int=random.randint(0, 500)))
-
-schema = graphene.Schema(query=Query, subscription=Subscription)
 
+from graphql_ws.gevent import GeventSubscriptionServer
 
+from schema import schema
+from template import render_graphiql
 
 app = Flask(__name__)
 app.debug = True
@@ -48,12 +18,14 @@ def resolve_random_int(root, info):
 def graphql_view():
     return make_response(render_graphiql())
 
+
 app.add_url_rule(
     '/graphql', view_func=GraphQLView.as_view('graphql', schema=schema, graphiql=False))
 
 subscription_server = GeventSubscriptionServer(schema)
 app.app_protocol = lambda environ_path_info: 'graphql-ws'
 
+
 @sockets.route('/subscriptions')
 def echo_socket(ws):
     subscription_server.handle(ws)

examples/template.py examples/aiohttp/template.pyexamples/template.py renamed to examples/aiohttp/template.py

@@ -0,0 +1,6 @@
+graphql_ws
+gevent
+flask
+flask_graphql
+flask_sockets
+graphene>=2.0

examples/flask_gevent/flask_app.py examples/flask_gevent/app.pyexamples/flask_gevent/flask_app.py renamed to examples/flask_gevent/app.py

@@ -0,0 +1,30 @@
+import random
+import graphene
+from rx import Observable
+
+
+class Query(graphene.ObjectType):
+    base = graphene.String()
+
+
+class RandomType(graphene.ObjectType):
+    seconds = graphene.Int()
+    random_int = graphene.Int()
+
+
+class Subscription(graphene.ObjectType):
+
+    count_seconds = graphene.Int(up_to=graphene.Int())
+
+    random_int = graphene.Field(RandomType)
+
+    def resolve_count_seconds(root, info, up_to=5):
+        return Observable.interval(1000)\
+                         .map(lambda i: "{0}".format(i))\
+                         .take_while(lambda i: int(i) <= up_to)
+
+    def resolve_random_int(root, info):
+        return Observable.interval(1000).map(lambda i: RandomType(seconds=i, random_int=random.randint(0, 500)))
+
+
+schema = graphene.Schema(query=Query, subscription=Subscription)

examples/flask_gevent/requirements.txt

@@ -117,7 +117,7 @@ def render_graphiql():
   </script>
 </body>
 </html>''').substitute(
-        GRAPHIQL_VERSION='0.10.2',
+        GRAPHIQL_VERSION='0.11.7',
         SUBSCRIPTIONS_TRANSPORT_VERSION='0.7.0',
         subscriptionsEndpoint='ws://localhost:5000/subscriptions',
         # subscriptionsEndpoint='ws://localhost:5000/',