Skip to content

Commit ead6cb3

Browse files
committed
graphql-core v3 upgrade
remove graphiql move graphql subscribe to cylc.flow
1 parent 6ddbbfd commit ead6cb3

File tree

13 files changed

+909
-313
lines changed

13 files changed

+909
-313
lines changed

cylc/uiserver/app.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
from traitlets.config.loader import LazyConfigValue
8282

8383
from cylc.flow.network.graphql import (
84-
CylcGraphQLBackend, IgnoreFieldMiddleware
84+
CylcExecutionContext, IgnoreFieldMiddleware
8585
)
8686
from cylc.flow.profiler import Profiler
8787
from cylc.uiserver import (
@@ -106,7 +106,7 @@
106106
)
107107
from cylc.uiserver.resolvers import Resolvers
108108
from cylc.uiserver.schema import schema
109-
from cylc.uiserver.websockets.tornado import TornadoSubscriptionServer
109+
from cylc.uiserver.graphql.tornado_ws import TornadoSubscriptionServer
110110
from cylc.uiserver.workflows_mgr import WorkflowsManager
111111

112112

@@ -507,11 +507,11 @@ def initialize_handlers(self):
507507
{
508508
'schema': schema,
509509
'resolvers': self.resolvers,
510-
'backend': CylcGraphQLBackend(),
511510
'middleware': [
512511
AuthorizationMiddleware,
513512
IgnoreFieldMiddleware
514513
],
514+
'execution_context_class': CylcExecutionContext,
515515
'auth': self.authobj,
516516
}
517517
),
@@ -521,11 +521,11 @@ def initialize_handlers(self):
521521
{
522522
'schema': schema,
523523
'resolvers': self.resolvers,
524-
'backend': CylcGraphQLBackend(),
525524
'middleware': [
526525
AuthorizationMiddleware,
527526
IgnoreFieldMiddleware
528527
],
528+
'execution_context_class': CylcExecutionContext,
529529
'batch': True,
530530
'auth': self.authobj,
531531
}
@@ -565,11 +565,11 @@ def initialize_handlers(self):
565565
def set_sub_server(self):
566566
self.subscription_server = TornadoSubscriptionServer(
567567
schema,
568-
backend=CylcGraphQLBackend(),
569568
middleware=[
570569
IgnoreFieldMiddleware,
571570
AuthorizationMiddleware,
572571
],
572+
execution_context_class=CylcExecutionContext,
573573
auth=self.authobj,
574574
)
575575

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# You should have received a copy of the GNU General Public License
1414
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1515

16-
"""Websockets and subscriptions related code."""
16+
"""GraphQL, Websockets and subscriptions related code."""
1717

1818
from typing import (
1919
Awaitable,

0 commit comments

Comments
 (0)