Skip to content

bpo-46752: Introduce task groups in asyncio #31270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
Feb 15, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7edee0b
Integrate task groups from EdgeDb
gvanrossum Feb 10, 2022
f495375
Make test_taskgroups.py run and pass
gvanrossum Feb 10, 2022
a87275a
Rename taskgroup to taskgroups in the test code
gvanrossum Feb 10, 2022
4df0acc
Export TaskGroup from asyncio; remove __future__ import
gvanrossum Feb 10, 2022
56db921
Only keep the newest _is_base_error() and _task_cancel()
gvanrossum Feb 10, 2022
500581e
Get rid of MultiError in favor of ExceptionGroup
gvanrossum Feb 11, 2022
4843e94
Add TaskGroupError to __all__
gvanrossum Feb 11, 2022
63e712d
Avoid DeprecationWarning: There is no current event loop
gvanrossum Feb 11, 2022
d233dd1
Prevent warning "test altered the execution environment"
gvanrossum Feb 11, 2022
af574d5
Get rid of custom TaskGroupError
gvanrossum Feb 11, 2022
299f366
Update comments explaining why test 21 doesn't work
gvanrossum Feb 12, 2022
9de3c87
Add tests showing that 'plain' BaseExceptions work
gvanrossum Feb 12, 2022
0e1355d
Allow creating new tasks while __aexit__ is waiting
gvanrossum Feb 12, 2022
77ec0e4
Add an API to Task to manage 'cancel_requested' flag
gvanrossum Feb 14, 2022
17b64b5
Add tests for .cancelling() and .uncancel()
gvanrossum Feb 14, 2022
5e3f4b9
Merge remote-tracking branch 'origin/main' into taskgroups
gvanrossum Feb 14, 2022
0b9bccd
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 14, 2022
137ebe6
Replace EdgeDb copyright with a simpler attribution
gvanrossum Feb 15, 2022
f693c1c
Use task.cancelling() in task repr instead of access to private attri…
asvetlov Feb 15, 2022
b83734c
Change the internal imports
gvanrossum Feb 15, 2022
de3d820
Avoid needing self.loop in test
gvanrossum Feb 15, 2022
9712241
Make test 14 more robust
gvanrossum Feb 15, 2022
b3d4d18
Update Lib/asyncio/taskgroups.py
1st1 Feb 15, 2022
c1e5d64
Update Lib/test/test_asyncio/test_taskgroups.py
1st1 Feb 15, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Integrate task groups from EdgeDb
My plan is roughly the following:

- [x] Copy the files from EdgeDb without modifications
      (named following asyncio conventions)
- [ ] Bang on the tests until they will run
- [ ] Bang on the tests until they pass
- [ ] Remove pre-3.11 compatibility code
- [ ] Switch from MultiError to ExceptionGroup
- [ ] Other cleanup
- [ ] Add a public API to tasks.py to replace `__cancel_requested__`
  • Loading branch information
gvanrossum committed Feb 10, 2022
commit 7edee0b2ae2bc8fcddf677961f279b59d4bf720d
315 changes: 315 additions & 0 deletions Lib/asyncio/taskgroups.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,315 @@
#
# This source file is part of the EdgeDB open source project.
#
# Copyright 2016-present MagicStack Inc. and the EdgeDB authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#


from __future__ import annotations

import asyncio
import itertools
import sys
import textwrap
import traceback
import types
import weakref


class TaskGroup:

def __init__(self, *, name=None):
if name is None:
self._name = f'tg-{_name_counter()}'
else:
self._name = str(name)

self._entered = False
self._exiting = False
self._aborting = False
self._loop = None
self._parent_task = None
self._parent_cancel_requested = False
self._tasks = weakref.WeakSet()
self._unfinished_tasks = 0
self._errors = []
self._base_error = None
self._on_completed_fut = None

def get_name(self):
return self._name

def __repr__(self):
msg = f'<TaskGroup {self._name!r}'
if self._tasks:
msg += f' tasks:{len(self._tasks)}'
if self._unfinished_tasks:
msg += f' unfinished:{self._unfinished_tasks}'
if self._errors:
msg += f' errors:{len(self._errors)}'
if self._aborting:
msg += ' cancelling'
elif self._entered:
msg += ' entered'
msg += '>'
return msg

async def __aenter__(self):
if self._entered:
raise RuntimeError(
f"TaskGroup {self!r} has been already entered")
self._entered = True

if self._loop is None:
self._loop = asyncio.get_running_loop()

self._parent_task = asyncio.current_task(self._loop)
if self._parent_task is None:
raise RuntimeError(
f'TaskGroup {self!r} cannot determine the parent task')
self._patch_task(self._parent_task)

return self

async def __aexit__(self, et, exc, tb):
self._exiting = True
propagate_cancellation_error = None

if (exc is not None and
self._is_base_error(exc) and
self._base_error is None):
self._base_error = exc

if et is asyncio.CancelledError:
if self._parent_cancel_requested:
# Only if we did request task to cancel ourselves
# we mark it as no longer cancelled.
self._parent_task.__cancel_requested__ = False
else:
propagate_cancellation_error = et

if et is not None and not self._aborting:
# Our parent task is being cancelled:
#
# async with TaskGroup() as g:
# g.create_task(...)
# await ... # <- CancelledError
#
if et is asyncio.CancelledError:
propagate_cancellation_error = et

# or there's an exception in "async with":
#
# async with TaskGroup() as g:
# g.create_task(...)
# 1 / 0
#
self._abort()

# We use while-loop here because "self._on_completed_fut"
# can be cancelled multiple times if our parent task
# is being cancelled repeatedly (or even once, when
# our own cancellation is already in progress)
while self._unfinished_tasks:
if self._on_completed_fut is None:
self._on_completed_fut = self._loop.create_future()

try:
await self._on_completed_fut
except asyncio.CancelledError as ex:
if not self._aborting:
# Our parent task is being cancelled:
#
# async def wrapper():
# async with TaskGroup() as g:
# g.create_task(foo)
#
# "wrapper" is being cancelled while "foo" is
# still running.
propagate_cancellation_error = ex
self._abort()

self._on_completed_fut = None

assert self._unfinished_tasks == 0
self._on_completed_fut = None # no longer needed

if self._base_error is not None:
raise self._base_error

if propagate_cancellation_error is not None:
# The wrapping task was cancelled; since we're done with
# closing all child tasks, just propagate the cancellation
# request now.
raise propagate_cancellation_error

if et is not None and et is not asyncio.CancelledError:
self._errors.append(exc)

if self._errors:
# Exceptions are heavy objects that can have object
# cycles (bad for GC); let's not keep a reference to
# a bunch of them.
errors = self._errors
self._errors = None

me = TaskGroupError('unhandled errors in a TaskGroup',
errors=errors)
raise me from None

def create_task(self, coro):
if not self._entered:
raise RuntimeError(f"TaskGroup {self!r} has not been entered")
if self._exiting:
raise RuntimeError(f"TaskGroup {self!r} is awaiting in exit")
task = self._loop.create_task(coro)
task.add_done_callback(self._on_task_done)
self._unfinished_tasks += 1
self._tasks.add(task)
return task

if sys.version_info >= (3, 8):

# In Python 3.8 Tasks propagate all exceptions correctly,
# except for KeybaordInterrupt and SystemExit which are
# still considered special.

def _is_base_error(self, exc: BaseException) -> bool:
assert isinstance(exc, BaseException)
return isinstance(exc, (SystemExit, KeyboardInterrupt))

else:

# In Python prior to 3.8 all BaseExceptions are special and
# are bypassing the proper propagation through async/await
# code, essentially aborting the execution.

def _is_base_error(self, exc: BaseException) -> bool:
assert isinstance(exc, BaseException)
return not isinstance(exc, Exception)

def _patch_task(self, task):
# In Python 3.8 we'll need proper API on asyncio.Task to
# make TaskGroups possible. We need to be able to access
# information about task cancellation, more specifically,
# we need a flag to say if a task was cancelled or not.
# We also need to be able to flip that flag.

if sys.version_info >= (3, 9):
def _task_cancel(self, msg=None):
self.__cancel_requested__ = True
return asyncio.Task.cancel(self, msg)
else:
def _task_cancel(self):
self.__cancel_requested__ = True
return asyncio.Task.cancel(self)

if hasattr(task, '__cancel_requested__'):
return

task.__cancel_requested__ = False
# confirm that we were successful at adding the new attribute:
assert not task.__cancel_requested__

task.cancel = types.MethodType(_task_cancel, task)

def _abort(self):
self._aborting = True

for t in self._tasks:
if not t.done():
t.cancel()

def _on_task_done(self, task):
self._unfinished_tasks -= 1
assert self._unfinished_tasks >= 0

if self._exiting and not self._unfinished_tasks:
if not self._on_completed_fut.done():
self._on_completed_fut.set_result(True)

if task.cancelled():
return

exc = task.exception()
if exc is None:
return

self._errors.append(exc)
if self._is_base_error(exc) and self._base_error is None:
self._base_error = exc

if self._parent_task.done():
# Not sure if this case is possible, but we want to handle
# it anyways.
self._loop.call_exception_handler({
'message': f'Task {task!r} has errored out but its parent '
f'task {self._parent_task} is already completed',
'exception': exc,
'task': task,
})
return

self._abort()
if not self._parent_task.__cancel_requested__:
# If parent task *is not* being cancelled, it means that we want
# to manually cancel it to abort whatever is being run right now
# in the TaskGroup. But we want to mark parent task as
# "not cancelled" later in __aexit__. Example situation that
# we need to handle:
#
# async def foo():
# try:
# async with TaskGroup() as g:
# g.create_task(crash_soon())
# await something # <- this needs to be canceled
# # by the TaskGroup, e.g.
# # foo() needs to be cancelled
# except Exception:
# # Ignore any exceptions raised in the TaskGroup
# pass
# await something_else # this line has to be called
# # after TaskGroup is finished.
self._parent_cancel_requested = True
self._parent_task.cancel()


class MultiError(Exception):

def __init__(self, msg, *args, errors=()):
if errors:
types = set(type(e).__name__ for e in errors)
msg = f'{msg}; {len(errors)} sub errors: ({", ".join(types)})'
for er in errors:
msg += f'\n + {type(er).__name__}: {er}'
if er.__traceback__:
er_tb = ''.join(traceback.format_tb(er.__traceback__))
er_tb = textwrap.indent(er_tb, ' | ')
msg += f'\n{er_tb}\n'
super().__init__(msg, *args)
self.__errors__ = tuple(errors)

def get_error_types(self):
return {type(e) for e in self.__errors__}

def __reduce__(self):
return (type(self), (self.args,), {'__errors__': self.__errors__})


class TaskGroupError(MultiError):
pass


_name_counter = itertools.count(1).__next__
Loading