Skip to content
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.

Sign up for GitHub

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

ref: Use better task cancellation logic #5397

Merged
merged 3 commits into from
Dec 28, 2024
Merged

ref: Use better task cancellation logic #5397

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53b8450
Use better task cancellation logic
cbornet Dec 24, 2024
9d3f9c9
Merge branch 'main' into task-cancel
ogabrielluiz Dec 28, 2024
c0c2e81
Merge branch 'main' into task-cancel
cbornet Dec 28, 2024
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
15 changes: 5 additions & 10 deletions src/backend/base/langflow/services/telemetry/service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import asyncio
import os
import platform
import sys
from datetime import datetime, timezone
from typing import TYPE_CHECKING

Expand Down Expand Up @@ -135,15 +134,11 @@ async def flush(self) -> None:

async def _cancel_task(self, task: asyncio.Task, cancel_msg: str) -> None:
task.cancel(cancel_msg)
try:
await task
except asyncio.CancelledError:
current_task = asyncio.current_task()
if sys.version_info >= (3, 11):
if current_task and current_task.cancelling() > 0:
raise
elif current_task and hasattr(current_task, "_must_cancel") and current_task._must_cancel:
raise
await asyncio.wait([task])
if not task.cancelled():
exc = task.exception()
if exc is not None:
raise exc

async def stop(self) -> None:
if self.do_not_track or self._stopping:
Expand Down
Loading