Skip to content

Commit

Permalink
[dagster-graphql] remove gevent (#7402)
Browse files Browse the repository at this point in the history
some clean-up ahead of trying to convert Observables to async gens to drop rx


## Test Plan

bk - we should only be using the threads path now
  • Loading branch information
alangenfeld committed Apr 15, 2022
1 parent 53b4f09 commit 74dafde
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 24 deletions.
8 changes: 1 addition & 7 deletions python_modules/dagster-graphql/dagster_graphql/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import click
import requests
from graphql import graphql
from graphql.execution.executors.gevent import GeventExecutor
from graphql.execution.executors.sync import SyncExecutor

from dagster import __version__ as dagster_version
from dagster import check, seven
Expand All @@ -27,26 +25,22 @@ def create_dagster_graphql_cli():
return ui


def execute_query(workspace_process_context, query, variables=None, use_sync_executor=False):
def execute_query(workspace_process_context, query, variables=None):
check.inst_param(
workspace_process_context, "workspace_process_context", WorkspaceProcessContext
)
check.str_param(query, "query")
check.opt_dict_param(variables, "variables")
check.bool_param(use_sync_executor, "use_sync_executor")

query = query.strip("'\" \n\t")

context = workspace_process_context.create_request_context()

executor = SyncExecutor() if use_sync_executor else GeventExecutor()

result = graphql(
request_string=query,
schema=create_schema(),
context_value=context,
variable_values=variables,
executor=executor,
)

result_dict = result.to_dict()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
from threading import Event, Thread
from time import sleep

import gevent

from dagster import check


Expand Down Expand Up @@ -52,19 +50,13 @@ def __call__(self, observer):
def load_events(self):
self.state = State.LOADING

# support for gevent based dagit server
if gevent.get_hub().gr_frame:
self.stopping = gevent.event.Event()
self.stopped = gevent.event.Event()
load_thread = gevent.Greenlet(self.background_event_loading, gevent.sleep)
else:
self.stopping = Event()
self.stopped = Event()
load_thread = Thread(
target=self.background_event_loading,
args=(sleep,),
name=f"load-events-{self.run_id}",
)
self.stopping = Event()
self.stopped = Event()
load_thread = Thread(
target=self.background_event_loading,
args=(sleep,),
name=f"load-events-{self.run_id}",
)

load_thread.start()

Expand Down
2 changes: 0 additions & 2 deletions python_modules/dagster-graphql/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ def get_version() -> str:
f"dagster{pin}",
"graphene>=2.1.3,<3", # compatability with graphql-ws in dagit
"graphql-core>=2.1,<3", # compatability with graphql-ws in dagit
"gevent-websocket>=0.10.1",
"gevent",
"requests",
"gql<3",
],
Expand Down

0 comments on commit 74dafde

Please sign in to comment.