From 9f9af327c9115356433ec837f349d6286730fb97 Mon Sep 17 00:00:00 2001 From: "Yuichiro Tachibana (Tsuchiya)" Date: Tue, 26 Sep 2023 04:58:01 +0800 Subject: [PATCH] [Refactoring] Convert async functions that don't contain `await` statements to normal functions (#5677) * [Refactoring] Convert async functions that don't contain `await` statements to normal functions * add changeset * add changeset * fix tests --------- Co-authored-by: gradio-pr-bot Co-authored-by: Abubakar Abid --- .changeset/famous-comics-fly.md | 5 +++++ gradio/blocks.py | 6 +++--- gradio/queueing.py | 2 +- test/test_queueing.py | 10 ++++------ 4 files changed, 13 insertions(+), 10 deletions(-) create mode 100644 .changeset/famous-comics-fly.md diff --git a/.changeset/famous-comics-fly.md b/.changeset/famous-comics-fly.md new file mode 100644 index 0000000000..484998d5aa --- /dev/null +++ b/.changeset/famous-comics-fly.md @@ -0,0 +1,5 @@ +--- +"gradio": patch +--- + +feat:[Refactoring] Convert async functions that don't contain `await` statements to normal functions diff --git a/gradio/blocks.py b/gradio/blocks.py index cf58b8e785..4e84439cc4 100644 --- a/gradio/blocks.py +++ b/gradio/blocks.py @@ -1553,7 +1553,7 @@ Received outputs: "average_duration": block_fn.total_runtime / block_fn.total_runs, } - async def create_limiter(self): + def create_limiter(self): self.limiter = ( None if self.max_threads == 40 @@ -2344,10 +2344,10 @@ Received outputs: """Events that should be run when the app containing this block starts up.""" if self.enable_queue: - utils.run_coro_in_background(self._queue.start, self.ssl_verify) + self._queue.start() # So that processing can resume in case the queue was stopped self._queue.stopped = False - utils.run_coro_in_background(self.create_limiter) + self.create_limiter() def queue_enabled_for_fn(self, fn_index: int): if self.dependencies[fn_index]["queue"] is None: diff --git a/gradio/queueing.py b/gradio/queueing.py index a36c0668b3..432f7f8acc 100644 --- a/gradio/queueing.py +++ b/gradio/queueing.py @@ -76,7 +76,7 @@ class Queue: self.blocks_dependencies = blocks_dependencies self.continuous_tasks: list[Event] = [] - async def start(self, ssl_verify=True): + def start(self): run_coro_in_background(self.start_processing) run_coro_in_background(self.start_log_and_progress_updates) if not self.live_updates: diff --git a/test/test_queueing.py b/test/test_queueing.py index 6f94495e3a..9c102d959b 100644 --- a/test/test_queueing.py +++ b/test/test_queueing.py @@ -36,15 +36,13 @@ def mock_event() -> Event: class TestQueueMethods: - @pytest.mark.asyncio - async def test_start(self, queue: Queue): - await queue.start() + def test_start(self, queue: Queue): + queue.start() assert queue.stopped is False assert queue.get_active_worker_count() == 0 - @pytest.mark.asyncio - async def test_stop_resume(self, queue: Queue): - await queue.start() + def test_stop_resume(self, queue: Queue): + queue.start() queue.close() assert queue.stopped queue.resume()