From e54b8ebd681917f2685aef7f1d66ec02f4a00b33 Mon Sep 17 00:00:00 2001 From: dev-satoshi Date: Wed, 14 Aug 2024 18:46:37 +0900 Subject: [PATCH 1/3] fix(types): Replace custom TYPE_CHECKING with stdlib typing.TYPE_CHECKING --- sentry_sdk/_types.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sentry_sdk/_types.py b/sentry_sdk/_types.py index 5255fcb0fa..4e3c195cc6 100644 --- a/sentry_sdk/_types.py +++ b/sentry_sdk/_types.py @@ -1,7 +1,4 @@ -try: - from typing import TYPE_CHECKING -except ImportError: - TYPE_CHECKING = False +from typing import TYPE_CHECKING # Re-exported for compat, since code out there in the wild might use this variable. From f4ce80fe67f60de29a7d383100d28d8971f3bf41 Mon Sep 17 00:00:00 2001 From: dev-satoshi Date: Thu, 15 Aug 2024 01:14:59 +0900 Subject: [PATCH 2/3] fix(types): replace custom TYPE_CHECKING with typing.TYPE_CHECKING --- scripts/init_serverless_sdk.py | 2 +- sentry_sdk/_compat.py | 2 +- sentry_sdk/_queue.py | 2 +- sentry_sdk/_werkzeug.py | 2 +- sentry_sdk/ai/monitoring.py | 2 +- sentry_sdk/ai/utils.py | 2 +- sentry_sdk/api.py | 2 +- sentry_sdk/attachments.py | 2 +- sentry_sdk/client.py | 4 ++-- sentry_sdk/consts.py | 2 +- sentry_sdk/crons/api.py | 2 +- sentry_sdk/crons/decorator.py | 2 +- sentry_sdk/envelope.py | 2 +- sentry_sdk/hub.py | 2 +- sentry_sdk/integrations/__init__.py | 2 +- sentry_sdk/integrations/_asgi_common.py | 2 +- sentry_sdk/integrations/_wsgi_common.py | 2 +- sentry_sdk/integrations/aiohttp.py | 2 +- sentry_sdk/integrations/argv.py | 2 +- sentry_sdk/integrations/ariadne.py | 2 +- sentry_sdk/integrations/arq.py | 2 +- sentry_sdk/integrations/asgi.py | 2 +- sentry_sdk/integrations/asyncio.py | 2 +- sentry_sdk/integrations/atexit.py | 2 +- sentry_sdk/integrations/aws_lambda.py | 2 +- sentry_sdk/integrations/beam.py | 2 +- sentry_sdk/integrations/boto3.py | 2 +- sentry_sdk/integrations/bottle.py | 2 +- sentry_sdk/integrations/celery/__init__.py | 2 +- sentry_sdk/integrations/celery/beat.py | 2 +- sentry_sdk/integrations/celery/utils.py | 2 +- sentry_sdk/integrations/chalice.py | 2 +- sentry_sdk/integrations/clickhouse_driver.py | 2 +- sentry_sdk/integrations/cloud_resource_context.py | 2 +- sentry_sdk/integrations/cohere.py | 2 +- sentry_sdk/integrations/dedupe.py | 2 +- sentry_sdk/integrations/django/__init__.py | 2 +- sentry_sdk/integrations/django/asgi.py | 2 +- sentry_sdk/integrations/django/middleware.py | 2 +- sentry_sdk/integrations/django/signals_handlers.py | 2 +- sentry_sdk/integrations/django/templates.py | 2 +- sentry_sdk/integrations/django/transactions.py | 2 +- sentry_sdk/integrations/django/views.py | 2 +- sentry_sdk/integrations/dramatiq.py | 2 +- sentry_sdk/integrations/excepthook.py | 2 +- sentry_sdk/integrations/executing.py | 2 +- sentry_sdk/integrations/falcon.py | 2 +- sentry_sdk/integrations/fastapi.py | 2 +- sentry_sdk/integrations/flask.py | 2 +- sentry_sdk/integrations/gcp.py | 2 +- sentry_sdk/integrations/gnu_backtrace.py | 2 +- sentry_sdk/integrations/gql.py | 2 +- sentry_sdk/integrations/graphene.py | 2 +- sentry_sdk/integrations/grpc/__init__.py | 2 +- sentry_sdk/integrations/grpc/aio/server.py | 2 +- sentry_sdk/integrations/grpc/client.py | 2 +- sentry_sdk/integrations/grpc/server.py | 2 +- sentry_sdk/integrations/httpx.py | 2 +- sentry_sdk/integrations/huey.py | 2 +- sentry_sdk/integrations/langchain.py | 2 +- sentry_sdk/integrations/litestar.py | 2 +- sentry_sdk/integrations/logging.py | 2 +- sentry_sdk/integrations/loguru.py | 2 +- sentry_sdk/integrations/modules.py | 2 +- sentry_sdk/integrations/openai.py | 2 +- sentry_sdk/integrations/opentelemetry/propagator.py | 2 +- sentry_sdk/integrations/opentelemetry/span_processor.py | 2 +- sentry_sdk/integrations/pure_eval.py | 2 +- sentry_sdk/integrations/pymongo.py | 2 +- sentry_sdk/integrations/pyramid.py | 2 +- sentry_sdk/integrations/quart.py | 2 +- sentry_sdk/integrations/redis/__init__.py | 2 +- sentry_sdk/integrations/redis/_async_common.py | 2 +- sentry_sdk/integrations/redis/_sync_common.py | 2 +- sentry_sdk/integrations/redis/modules/caches.py | 2 +- sentry_sdk/integrations/redis/modules/queries.py | 2 +- sentry_sdk/integrations/redis/redis.py | 2 +- sentry_sdk/integrations/redis/redis_cluster.py | 2 +- sentry_sdk/integrations/redis/utils.py | 2 +- sentry_sdk/integrations/rq.py | 2 +- sentry_sdk/integrations/sanic.py | 2 +- sentry_sdk/integrations/serverless.py | 2 +- sentry_sdk/integrations/spark/spark_driver.py | 2 +- sentry_sdk/integrations/spark/spark_worker.py | 2 +- sentry_sdk/integrations/sqlalchemy.py | 2 +- sentry_sdk/integrations/starlette.py | 2 +- sentry_sdk/integrations/starlite.py | 2 +- sentry_sdk/integrations/stdlib.py | 2 +- sentry_sdk/integrations/strawberry.py | 2 +- sentry_sdk/integrations/threading.py | 2 +- sentry_sdk/integrations/tornado.py | 2 +- sentry_sdk/integrations/wsgi.py | 2 +- sentry_sdk/metrics.py | 2 +- sentry_sdk/monitor.py | 2 +- sentry_sdk/profiler/continuous_profiler.py | 2 +- sentry_sdk/profiler/transaction_profiler.py | 2 +- sentry_sdk/profiler/utils.py | 2 +- sentry_sdk/scope.py | 2 +- sentry_sdk/scrubber.py | 2 +- sentry_sdk/serializer.py | 2 +- sentry_sdk/session.py | 2 +- sentry_sdk/sessions.py | 2 +- sentry_sdk/spotlight.py | 2 +- sentry_sdk/tracing.py | 2 +- sentry_sdk/tracing_utils.py | 2 +- sentry_sdk/transport.py | 2 +- sentry_sdk/utils.py | 2 +- sentry_sdk/worker.py | 2 +- tests/conftest.py | 2 +- tests/integrations/sanic/test_sanic.py | 2 +- tests/test_client.py | 2 +- 111 files changed, 112 insertions(+), 112 deletions(-) diff --git a/scripts/init_serverless_sdk.py b/scripts/init_serverless_sdk.py index a4953ca9d7..d5ce6c5b77 100644 --- a/scripts/init_serverless_sdk.py +++ b/scripts/init_serverless_sdk.py @@ -11,7 +11,7 @@ import re import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.integrations.aws_lambda import AwsLambdaIntegration if TYPE_CHECKING: diff --git a/sentry_sdk/_compat.py b/sentry_sdk/_compat.py index f7fd6903a4..3df12d5534 100644 --- a/sentry_sdk/_compat.py +++ b/sentry_sdk/_compat.py @@ -1,6 +1,6 @@ import sys -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/_queue.py b/sentry_sdk/_queue.py index 056d576fbe..c0410d1f92 100644 --- a/sentry_sdk/_queue.py +++ b/sentry_sdk/_queue.py @@ -76,7 +76,7 @@ from collections import deque from time import time -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/_werkzeug.py b/sentry_sdk/_werkzeug.py index 3f6b6b06a4..0fa3d611f1 100644 --- a/sentry_sdk/_werkzeug.py +++ b/sentry_sdk/_werkzeug.py @@ -32,7 +32,7 @@ SUCH DAMAGE. """ -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Dict diff --git a/sentry_sdk/ai/monitoring.py b/sentry_sdk/ai/monitoring.py index b8f6a8c79a..0fb928b57e 100644 --- a/sentry_sdk/ai/monitoring.py +++ b/sentry_sdk/ai/monitoring.py @@ -5,7 +5,7 @@ from sentry_sdk import start_span from sentry_sdk.tracing import Span from sentry_sdk.utils import ContextVar -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Optional, Callable, Any diff --git a/sentry_sdk/ai/utils.py b/sentry_sdk/ai/utils.py index 42d46304e4..ed3494f679 100644 --- a/sentry_sdk/ai/utils.py +++ b/sentry_sdk/ai/utils.py @@ -1,4 +1,4 @@ -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/api.py b/sentry_sdk/api.py index 3c0876382c..a723e5a786 100644 --- a/sentry_sdk/api.py +++ b/sentry_sdk/api.py @@ -10,7 +10,7 @@ from sentry_sdk.crons import monitor -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from collections.abc import Mapping diff --git a/sentry_sdk/attachments.py b/sentry_sdk/attachments.py index 649c4f175b..15723e6f68 100644 --- a/sentry_sdk/attachments.py +++ b/sentry_sdk/attachments.py @@ -1,7 +1,7 @@ import os import mimetypes -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.envelope import Item, PayloadRef if TYPE_CHECKING: diff --git a/sentry_sdk/client.py b/sentry_sdk/client.py index c3e8daf400..b224cd1fd5 100644 --- a/sentry_sdk/client.py +++ b/sentry_sdk/client.py @@ -44,7 +44,7 @@ from sentry_sdk.monitor import Monitor from sentry_sdk.spotlight import setup_spotlight -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any @@ -881,7 +881,7 @@ def __exit__(self, exc_type, exc_value, tb): self.close() -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: # Make mypy, PyCharm and other static analyzers think `get_options` is a diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py index 83fe9ae6e8..5581f191b7 100644 --- a/sentry_sdk/consts.py +++ b/sentry_sdk/consts.py @@ -1,7 +1,7 @@ import itertools from enum import Enum -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING # up top to prevent circular import due to integration import DEFAULT_MAX_VALUE_LENGTH = 1024 diff --git a/sentry_sdk/crons/api.py b/sentry_sdk/crons/api.py index 7f27df9b3a..5109d17ab0 100644 --- a/sentry_sdk/crons/api.py +++ b/sentry_sdk/crons/api.py @@ -1,7 +1,7 @@ import uuid import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/crons/decorator.py b/sentry_sdk/crons/decorator.py index 885d42e0e1..ea2c6781a0 100644 --- a/sentry_sdk/crons/decorator.py +++ b/sentry_sdk/crons/decorator.py @@ -1,7 +1,7 @@ from functools import wraps from inspect import iscoroutinefunction -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.crons import capture_checkin from sentry_sdk.crons.consts import MonitorStatus from sentry_sdk.utils import now diff --git a/sentry_sdk/envelope.py b/sentry_sdk/envelope.py index 6bb1eb22c7..286451832a 100644 --- a/sentry_sdk/envelope.py +++ b/sentry_sdk/envelope.py @@ -2,7 +2,7 @@ import json import mimetypes -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.session import Session from sentry_sdk.utils import json_dumps, capture_internal_exceptions diff --git a/sentry_sdk/hub.py b/sentry_sdk/hub.py index 7d81d69541..ec30e25419 100644 --- a/sentry_sdk/hub.py +++ b/sentry_sdk/hub.py @@ -22,7 +22,7 @@ ContextVar, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/__init__.py b/sentry_sdk/integrations/__init__.py index 3c43ed5472..3def629536 100644 --- a/sentry_sdk/integrations/__init__.py +++ b/sentry_sdk/integrations/__init__.py @@ -1,7 +1,7 @@ from abc import ABC, abstractmethod from threading import Lock -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.utils import logger diff --git a/sentry_sdk/integrations/_asgi_common.py b/sentry_sdk/integrations/_asgi_common.py index a099b42e32..87dcbae248 100644 --- a/sentry_sdk/integrations/_asgi_common.py +++ b/sentry_sdk/integrations/_asgi_common.py @@ -2,7 +2,7 @@ from sentry_sdk.scope import should_send_default_pii from sentry_sdk.integrations._wsgi_common import _filter_headers -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/_wsgi_common.py b/sentry_sdk/integrations/_wsgi_common.py index eeb8ee6136..c6e9f8157d 100644 --- a/sentry_sdk/integrations/_wsgi_common.py +++ b/sentry_sdk/integrations/_wsgi_common.py @@ -4,7 +4,7 @@ import sentry_sdk from sentry_sdk.scope import should_send_default_pii from sentry_sdk.utils import AnnotatedValue, logger -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING try: from django.http.request import RawPostDataException diff --git a/sentry_sdk/integrations/aiohttp.py b/sentry_sdk/integrations/aiohttp.py index f10b5079a7..33f2fc095c 100644 --- a/sentry_sdk/integrations/aiohttp.py +++ b/sentry_sdk/integrations/aiohttp.py @@ -41,7 +41,7 @@ except ImportError: raise DidNotEnable("AIOHTTP not installed") -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from aiohttp.web_request import Request diff --git a/sentry_sdk/integrations/argv.py b/sentry_sdk/integrations/argv.py index 3154f0c431..315feefb4a 100644 --- a/sentry_sdk/integrations/argv.py +++ b/sentry_sdk/integrations/argv.py @@ -4,7 +4,7 @@ from sentry_sdk.integrations import Integration from sentry_sdk.scope import add_global_event_processor -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Optional diff --git a/sentry_sdk/integrations/ariadne.py b/sentry_sdk/integrations/ariadne.py index c58caec8f0..173d182801 100644 --- a/sentry_sdk/integrations/ariadne.py +++ b/sentry_sdk/integrations/ariadne.py @@ -12,7 +12,7 @@ event_from_exception, package_version, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING try: # importing like this is necessary due to name shadowing in ariadne diff --git a/sentry_sdk/integrations/arq.py b/sentry_sdk/integrations/arq.py index c347ec5138..5c02cbe481 100644 --- a/sentry_sdk/integrations/arq.py +++ b/sentry_sdk/integrations/arq.py @@ -1,7 +1,7 @@ import sys import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import OP, SPANSTATUS from sentry_sdk.integrations import DidNotEnable, Integration from sentry_sdk.integrations.logging import ignore_logger diff --git a/sentry_sdk/integrations/asgi.py b/sentry_sdk/integrations/asgi.py index b952da021d..47e8c06e82 100644 --- a/sentry_sdk/integrations/asgi.py +++ b/sentry_sdk/integrations/asgi.py @@ -10,7 +10,7 @@ from functools import partial import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.api import continue_trace from sentry_sdk.consts import OP diff --git a/sentry_sdk/integrations/asyncio.py b/sentry_sdk/integrations/asyncio.py index 8a62755caa..aea5321fe1 100644 --- a/sentry_sdk/integrations/asyncio.py +++ b/sentry_sdk/integrations/asyncio.py @@ -3,7 +3,7 @@ import sentry_sdk from sentry_sdk.consts import OP from sentry_sdk.integrations import Integration, DidNotEnable -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.utils import event_from_exception, reraise try: diff --git a/sentry_sdk/integrations/atexit.py b/sentry_sdk/integrations/atexit.py index 9babbf235d..8ef2f8aa79 100644 --- a/sentry_sdk/integrations/atexit.py +++ b/sentry_sdk/integrations/atexit.py @@ -6,7 +6,7 @@ from sentry_sdk.utils import logger from sentry_sdk.integrations import Integration from sentry_sdk.utils import ensure_integration_enabled -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/aws_lambda.py b/sentry_sdk/integrations/aws_lambda.py index 560511b48b..96cdb10f24 100644 --- a/sentry_sdk/integrations/aws_lambda.py +++ b/sentry_sdk/integrations/aws_lambda.py @@ -19,7 +19,7 @@ ) from sentry_sdk.integrations import Integration from sentry_sdk.integrations._wsgi_common import _filter_headers -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/beam.py b/sentry_sdk/integrations/beam.py index a2323cb406..3b551694ce 100644 --- a/sentry_sdk/integrations/beam.py +++ b/sentry_sdk/integrations/beam.py @@ -11,7 +11,7 @@ event_from_exception, reraise, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/boto3.py b/sentry_sdk/integrations/boto3.py index 0fb997767b..9a89d705c6 100644 --- a/sentry_sdk/integrations/boto3.py +++ b/sentry_sdk/integrations/boto3.py @@ -5,7 +5,7 @@ from sentry_sdk.integrations import Integration, DidNotEnable from sentry_sdk.tracing import Span -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.utils import ( capture_internal_exceptions, ensure_integration_enabled, diff --git a/sentry_sdk/integrations/bottle.py b/sentry_sdk/integrations/bottle.py index c5dca2f822..863dd26717 100644 --- a/sentry_sdk/integrations/bottle.py +++ b/sentry_sdk/integrations/bottle.py @@ -10,7 +10,7 @@ from sentry_sdk.integrations import Integration, DidNotEnable from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware from sentry_sdk.integrations._wsgi_common import RequestExtractor -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from sentry_sdk.integrations.wsgi import _ScopedResponse diff --git a/sentry_sdk/integrations/celery/__init__.py b/sentry_sdk/integrations/celery/__init__.py index e1b54d0a37..8c470f9607 100644 --- a/sentry_sdk/integrations/celery/__init__.py +++ b/sentry_sdk/integrations/celery/__init__.py @@ -15,7 +15,7 @@ from sentry_sdk.integrations.celery.utils import _now_seconds_since_epoch from sentry_sdk.integrations.logging import ignore_logger from sentry_sdk.tracing import BAGGAGE_HEADER_NAME, TRANSACTION_SOURCE_TASK -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.tracing_utils import Baggage from sentry_sdk.utils import ( capture_internal_exceptions, diff --git a/sentry_sdk/integrations/celery/beat.py b/sentry_sdk/integrations/celery/beat.py index b40c39fa80..8ccdf60a12 100644 --- a/sentry_sdk/integrations/celery/beat.py +++ b/sentry_sdk/integrations/celery/beat.py @@ -5,7 +5,7 @@ _get_humanized_interval, _now_seconds_since_epoch, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.utils import ( logger, match_regex_list, diff --git a/sentry_sdk/integrations/celery/utils.py b/sentry_sdk/integrations/celery/utils.py index 952911a9f6..85066947ac 100644 --- a/sentry_sdk/integrations/celery/utils.py +++ b/sentry_sdk/integrations/celery/utils.py @@ -1,7 +1,7 @@ import time from typing import cast -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any, Tuple diff --git a/sentry_sdk/integrations/chalice.py b/sentry_sdk/integrations/chalice.py index 379e46883f..72e8920c94 100644 --- a/sentry_sdk/integrations/chalice.py +++ b/sentry_sdk/integrations/chalice.py @@ -11,7 +11,7 @@ parse_version, reraise, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING try: import chalice # type: ignore diff --git a/sentry_sdk/integrations/clickhouse_driver.py b/sentry_sdk/integrations/clickhouse_driver.py index 0f63f868d5..6bfbc1e2b4 100644 --- a/sentry_sdk/integrations/clickhouse_driver.py +++ b/sentry_sdk/integrations/clickhouse_driver.py @@ -2,7 +2,7 @@ from sentry_sdk.consts import OP, SPANDATA from sentry_sdk.integrations import Integration, DidNotEnable from sentry_sdk.tracing import Span -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.scope import should_send_default_pii from sentry_sdk.utils import capture_internal_exceptions, ensure_integration_enabled diff --git a/sentry_sdk/integrations/cloud_resource_context.py b/sentry_sdk/integrations/cloud_resource_context.py index 695bf17d38..8d080899f3 100644 --- a/sentry_sdk/integrations/cloud_resource_context.py +++ b/sentry_sdk/integrations/cloud_resource_context.py @@ -5,7 +5,7 @@ from sentry_sdk.api import set_context from sentry_sdk.utils import logger -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Dict diff --git a/sentry_sdk/integrations/cohere.py b/sentry_sdk/integrations/cohere.py index b32d720b77..bcd4ef6e23 100644 --- a/sentry_sdk/integrations/cohere.py +++ b/sentry_sdk/integrations/cohere.py @@ -1,7 +1,7 @@ from functools import wraps from sentry_sdk import consts -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.ai.monitoring import record_token_usage from sentry_sdk.consts import SPANDATA from sentry_sdk.ai.utils import set_data_normalized diff --git a/sentry_sdk/integrations/dedupe.py b/sentry_sdk/integrations/dedupe.py index 02469b6911..be6d9311a3 100644 --- a/sentry_sdk/integrations/dedupe.py +++ b/sentry_sdk/integrations/dedupe.py @@ -3,7 +3,7 @@ from sentry_sdk.integrations import Integration from sentry_sdk.scope import add_global_event_processor -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Optional diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py index 508df2e431..951f61943b 100644 --- a/sentry_sdk/integrations/django/__init__.py +++ b/sentry_sdk/integrations/django/__init__.py @@ -5,7 +5,7 @@ from importlib import import_module import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import OP, SPANDATA from sentry_sdk.db.explain_plan.django import attach_explain_plan_to_span from sentry_sdk.scope import add_global_event_processor, should_send_default_pii diff --git a/sentry_sdk/integrations/django/asgi.py b/sentry_sdk/integrations/django/asgi.py index 11691de5a4..2894b2dc86 100644 --- a/sentry_sdk/integrations/django/asgi.py +++ b/sentry_sdk/integrations/django/asgi.py @@ -13,7 +13,7 @@ from django.core.handlers.wsgi import WSGIRequest import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.integrations.asgi import SentryAsgiMiddleware diff --git a/sentry_sdk/integrations/django/middleware.py b/sentry_sdk/integrations/django/middleware.py index 6f75444cbf..c7428846ad 100644 --- a/sentry_sdk/integrations/django/middleware.py +++ b/sentry_sdk/integrations/django/middleware.py @@ -7,7 +7,7 @@ from django import VERSION as DJANGO_VERSION import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.utils import ( ContextVar, diff --git a/sentry_sdk/integrations/django/signals_handlers.py b/sentry_sdk/integrations/django/signals_handlers.py index 0cd084f697..7cc73f338d 100644 --- a/sentry_sdk/integrations/django/signals_handlers.py +++ b/sentry_sdk/integrations/django/signals_handlers.py @@ -3,7 +3,7 @@ from django.dispatch import Signal import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.integrations.django import DJANGO_VERSION diff --git a/sentry_sdk/integrations/django/templates.py b/sentry_sdk/integrations/django/templates.py index e91e1a908c..92fec892d8 100644 --- a/sentry_sdk/integrations/django/templates.py +++ b/sentry_sdk/integrations/django/templates.py @@ -5,7 +5,7 @@ from django import VERSION as DJANGO_VERSION import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.utils import ensure_integration_enabled diff --git a/sentry_sdk/integrations/django/transactions.py b/sentry_sdk/integrations/django/transactions.py index 409ae77c45..5a7d69f3c9 100644 --- a/sentry_sdk/integrations/django/transactions.py +++ b/sentry_sdk/integrations/django/transactions.py @@ -7,7 +7,7 @@ import re -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from django.urls.resolvers import URLResolver diff --git a/sentry_sdk/integrations/django/views.py b/sentry_sdk/integrations/django/views.py index 1bcee492bf..fea00e5b03 100644 --- a/sentry_sdk/integrations/django/views.py +++ b/sentry_sdk/integrations/django/views.py @@ -2,7 +2,7 @@ import sentry_sdk from sentry_sdk.consts import OP -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/dramatiq.py b/sentry_sdk/integrations/dramatiq.py index 673c3323e8..ce363c9a26 100644 --- a/sentry_sdk/integrations/dramatiq.py +++ b/sentry_sdk/integrations/dramatiq.py @@ -2,7 +2,7 @@ import sentry_sdk from sentry_sdk.integrations import Integration -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.integrations._wsgi_common import request_body_within_bounds from sentry_sdk.utils import ( AnnotatedValue, diff --git a/sentry_sdk/integrations/excepthook.py b/sentry_sdk/integrations/excepthook.py index 58abde6614..61c7e460bf 100644 --- a/sentry_sdk/integrations/excepthook.py +++ b/sentry_sdk/integrations/excepthook.py @@ -7,7 +7,7 @@ ) from sentry_sdk.integrations import Integration -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Callable diff --git a/sentry_sdk/integrations/executing.py b/sentry_sdk/integrations/executing.py index d6817c5041..2a6e636a3e 100644 --- a/sentry_sdk/integrations/executing.py +++ b/sentry_sdk/integrations/executing.py @@ -1,5 +1,5 @@ import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.integrations import Integration, DidNotEnable from sentry_sdk.scope import add_global_event_processor from sentry_sdk.utils import walk_exception_chain, iter_stacks diff --git a/sentry_sdk/integrations/falcon.py b/sentry_sdk/integrations/falcon.py index 0e0bfec9c8..00ac106e15 100644 --- a/sentry_sdk/integrations/falcon.py +++ b/sentry_sdk/integrations/falcon.py @@ -10,7 +10,7 @@ parse_version, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/fastapi.py b/sentry_sdk/integrations/fastapi.py index 09784560b4..f4afa1fdd5 100644 --- a/sentry_sdk/integrations/fastapi.py +++ b/sentry_sdk/integrations/fastapi.py @@ -3,7 +3,7 @@ from functools import wraps import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.integrations import DidNotEnable from sentry_sdk.scope import should_send_default_pii from sentry_sdk.tracing import SOURCE_FOR_STYLE, TRANSACTION_SOURCE_ROUTE diff --git a/sentry_sdk/integrations/flask.py b/sentry_sdk/integrations/flask.py index 8d82c57695..62216134b6 100644 --- a/sentry_sdk/integrations/flask.py +++ b/sentry_sdk/integrations/flask.py @@ -1,5 +1,5 @@ import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.integrations import DidNotEnable, Integration from sentry_sdk.integrations._wsgi_common import RequestExtractor from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware diff --git a/sentry_sdk/integrations/gcp.py b/sentry_sdk/integrations/gcp.py index 86d3706fda..688d0de4d4 100644 --- a/sentry_sdk/integrations/gcp.py +++ b/sentry_sdk/integrations/gcp.py @@ -20,7 +20,7 @@ reraise, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING # Constants TIMEOUT_WARNING_BUFFER = 1.5 # Buffer time required to send timeout warning to Sentry diff --git a/sentry_sdk/integrations/gnu_backtrace.py b/sentry_sdk/integrations/gnu_backtrace.py index 32d2afafbf..dc3dc80fe0 100644 --- a/sentry_sdk/integrations/gnu_backtrace.py +++ b/sentry_sdk/integrations/gnu_backtrace.py @@ -5,7 +5,7 @@ from sentry_sdk.scope import add_global_event_processor from sentry_sdk.utils import capture_internal_exceptions -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/gql.py b/sentry_sdk/integrations/gql.py index 220095f2ac..5074442986 100644 --- a/sentry_sdk/integrations/gql.py +++ b/sentry_sdk/integrations/gql.py @@ -16,7 +16,7 @@ except ImportError: raise DidNotEnable("gql is not installed") -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any, Dict, Tuple, Union diff --git a/sentry_sdk/integrations/graphene.py b/sentry_sdk/integrations/graphene.py index aa16dce92b..e3d1f796a2 100644 --- a/sentry_sdk/integrations/graphene.py +++ b/sentry_sdk/integrations/graphene.py @@ -10,7 +10,7 @@ event_from_exception, package_version, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING try: diff --git a/sentry_sdk/integrations/grpc/__init__.py b/sentry_sdk/integrations/grpc/__init__.py index d84cea573f..1a577d4f47 100644 --- a/sentry_sdk/integrations/grpc/__init__.py +++ b/sentry_sdk/integrations/grpc/__init__.py @@ -6,7 +6,7 @@ from grpc.aio import Server as AsyncServer from sentry_sdk.integrations import Integration -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from .client import ClientInterceptor from .server import ServerInterceptor diff --git a/sentry_sdk/integrations/grpc/aio/server.py b/sentry_sdk/integrations/grpc/aio/server.py index 2fdcb0b8f0..43eaf70508 100644 --- a/sentry_sdk/integrations/grpc/aio/server.py +++ b/sentry_sdk/integrations/grpc/aio/server.py @@ -1,5 +1,5 @@ import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.integrations import DidNotEnable from sentry_sdk.integrations.grpc.consts import SPAN_ORIGIN diff --git a/sentry_sdk/integrations/grpc/client.py b/sentry_sdk/integrations/grpc/client.py index c12f0ab2c4..e268c20ae9 100644 --- a/sentry_sdk/integrations/grpc/client.py +++ b/sentry_sdk/integrations/grpc/client.py @@ -1,5 +1,5 @@ import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.integrations import DidNotEnable from sentry_sdk.integrations.grpc.consts import SPAN_ORIGIN diff --git a/sentry_sdk/integrations/grpc/server.py b/sentry_sdk/integrations/grpc/server.py index 74ab550529..d769c2a353 100644 --- a/sentry_sdk/integrations/grpc/server.py +++ b/sentry_sdk/integrations/grpc/server.py @@ -1,5 +1,5 @@ import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.integrations import DidNotEnable from sentry_sdk.integrations.grpc.consts import SPAN_ORIGIN diff --git a/sentry_sdk/integrations/httpx.py b/sentry_sdk/integrations/httpx.py index d35990cb30..3ab47bce70 100644 --- a/sentry_sdk/integrations/httpx.py +++ b/sentry_sdk/integrations/httpx.py @@ -11,7 +11,7 @@ parse_url, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/huey.py b/sentry_sdk/integrations/huey.py index 21ccf95813..14fa5353e9 100644 --- a/sentry_sdk/integrations/huey.py +++ b/sentry_sdk/integrations/huey.py @@ -2,7 +2,7 @@ from datetime import datetime import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.api import continue_trace, get_baggage, get_traceparent from sentry_sdk.consts import OP, SPANSTATUS from sentry_sdk.integrations import DidNotEnable, Integration diff --git a/sentry_sdk/integrations/langchain.py b/sentry_sdk/integrations/langchain.py index 60c791fa12..eb6257fcbc 100644 --- a/sentry_sdk/integrations/langchain.py +++ b/sentry_sdk/integrations/langchain.py @@ -2,7 +2,7 @@ from functools import wraps import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.ai.monitoring import set_ai_pipeline_name, record_token_usage from sentry_sdk.consts import OP, SPANDATA from sentry_sdk.ai.utils import set_data_normalized diff --git a/sentry_sdk/integrations/litestar.py b/sentry_sdk/integrations/litestar.py index 8eb3b44ca4..0795414a20 100644 --- a/sentry_sdk/integrations/litestar.py +++ b/sentry_sdk/integrations/litestar.py @@ -1,5 +1,5 @@ import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.integrations import DidNotEnable, Integration from sentry_sdk.integrations.asgi import SentryAsgiMiddleware diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py index 231ec5d80e..6aa4563421 100644 --- a/sentry_sdk/integrations/logging.py +++ b/sentry_sdk/integrations/logging.py @@ -10,7 +10,7 @@ capture_internal_exceptions, ) from sentry_sdk.integrations import Integration -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from collections.abc import MutableMapping diff --git a/sentry_sdk/integrations/loguru.py b/sentry_sdk/integrations/loguru.py index 99f2dfd5ac..4d7ead452e 100644 --- a/sentry_sdk/integrations/loguru.py +++ b/sentry_sdk/integrations/loguru.py @@ -1,6 +1,6 @@ import enum -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.integrations import Integration, DidNotEnable from sentry_sdk.integrations.logging import ( BreadcrumbHandler, diff --git a/sentry_sdk/integrations/modules.py b/sentry_sdk/integrations/modules.py index 6376d25a30..ce3ee78665 100644 --- a/sentry_sdk/integrations/modules.py +++ b/sentry_sdk/integrations/modules.py @@ -3,7 +3,7 @@ from sentry_sdk.scope import add_global_event_processor from sentry_sdk.utils import _get_installed_modules -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/openai.py b/sentry_sdk/integrations/openai.py index d06c188712..616ee71ee9 100644 --- a/sentry_sdk/integrations/openai.py +++ b/sentry_sdk/integrations/openai.py @@ -1,7 +1,7 @@ from functools import wraps from sentry_sdk import consts -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.ai.monitoring import record_token_usage from sentry_sdk.consts import SPANDATA from sentry_sdk.ai.utils import set_data_normalized diff --git a/sentry_sdk/integrations/opentelemetry/propagator.py b/sentry_sdk/integrations/opentelemetry/propagator.py index 3df2ee2f2f..a92b95b177 100644 --- a/sentry_sdk/integrations/opentelemetry/propagator.py +++ b/sentry_sdk/integrations/opentelemetry/propagator.py @@ -18,7 +18,7 @@ TraceFlags, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.integrations.opentelemetry.consts import ( SENTRY_BAGGAGE_KEY, SENTRY_TRACE_KEY, diff --git a/sentry_sdk/integrations/opentelemetry/span_processor.py b/sentry_sdk/integrations/opentelemetry/span_processor.py index d54372b374..47f2f5df33 100644 --- a/sentry_sdk/integrations/opentelemetry/span_processor.py +++ b/sentry_sdk/integrations/opentelemetry/span_processor.py @@ -24,7 +24,7 @@ from sentry_sdk.scope import add_global_event_processor from sentry_sdk.tracing import Transaction, Span as SentrySpan from sentry_sdk.utils import Dsn -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from urllib3.util import parse_url as urlparse diff --git a/sentry_sdk/integrations/pure_eval.py b/sentry_sdk/integrations/pure_eval.py index d5325be384..fd929d214e 100644 --- a/sentry_sdk/integrations/pure_eval.py +++ b/sentry_sdk/integrations/pure_eval.py @@ -2,7 +2,7 @@ import sentry_sdk from sentry_sdk import serializer -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.integrations import Integration, DidNotEnable from sentry_sdk.scope import add_global_event_processor from sentry_sdk.utils import walk_exception_chain, iter_stacks diff --git a/sentry_sdk/integrations/pymongo.py b/sentry_sdk/integrations/pymongo.py index 08d9cf84cd..0c25c9d1d6 100644 --- a/sentry_sdk/integrations/pymongo.py +++ b/sentry_sdk/integrations/pymongo.py @@ -8,7 +8,7 @@ from sentry_sdk.tracing import Span from sentry_sdk.utils import capture_internal_exceptions -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING try: from pymongo import monitoring diff --git a/sentry_sdk/integrations/pyramid.py b/sentry_sdk/integrations/pyramid.py index 887837c0d6..4ee4735ff8 100644 --- a/sentry_sdk/integrations/pyramid.py +++ b/sentry_sdk/integrations/pyramid.py @@ -14,7 +14,7 @@ event_from_exception, reraise, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING try: from pyramid.httpexceptions import HTTPException diff --git a/sentry_sdk/integrations/quart.py b/sentry_sdk/integrations/quart.py index 0689406672..ac58f21175 100644 --- a/sentry_sdk/integrations/quart.py +++ b/sentry_sdk/integrations/quart.py @@ -14,7 +14,7 @@ ensure_integration_enabled, event_from_exception, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/redis/__init__.py b/sentry_sdk/integrations/redis/__init__.py index dded1bdcc0..a1a559da86 100644 --- a/sentry_sdk/integrations/redis/__init__.py +++ b/sentry_sdk/integrations/redis/__init__.py @@ -1,4 +1,4 @@ -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.integrations import Integration, DidNotEnable from sentry_sdk.integrations.redis.consts import _DEFAULT_MAX_DATA_SIZE from sentry_sdk.integrations.redis.rb import _patch_rb diff --git a/sentry_sdk/integrations/redis/_async_common.py b/sentry_sdk/integrations/redis/_async_common.py index 50d5ea6c82..5bb2f08839 100644 --- a/sentry_sdk/integrations/redis/_async_common.py +++ b/sentry_sdk/integrations/redis/_async_common.py @@ -1,4 +1,4 @@ -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.integrations.redis.consts import SPAN_ORIGIN from sentry_sdk.integrations.redis.modules.caches import ( diff --git a/sentry_sdk/integrations/redis/_sync_common.py b/sentry_sdk/integrations/redis/_sync_common.py index 6a01f5e18b..74729d7302 100644 --- a/sentry_sdk/integrations/redis/_sync_common.py +++ b/sentry_sdk/integrations/redis/_sync_common.py @@ -1,4 +1,4 @@ -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.integrations.redis.consts import SPAN_ORIGIN from sentry_sdk.integrations.redis.modules.caches import ( diff --git a/sentry_sdk/integrations/redis/modules/caches.py b/sentry_sdk/integrations/redis/modules/caches.py index 8d3469d141..c6613b4764 100644 --- a/sentry_sdk/integrations/redis/modules/caches.py +++ b/sentry_sdk/integrations/redis/modules/caches.py @@ -2,7 +2,7 @@ Code used for the Caches module in Sentry """ -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import OP, SPANDATA from sentry_sdk.integrations.redis.utils import _get_safe_key, _key_as_string from sentry_sdk.utils import capture_internal_exceptions diff --git a/sentry_sdk/integrations/redis/modules/queries.py b/sentry_sdk/integrations/redis/modules/queries.py index 79f82189ae..a6865d32a8 100644 --- a/sentry_sdk/integrations/redis/modules/queries.py +++ b/sentry_sdk/integrations/redis/modules/queries.py @@ -2,7 +2,7 @@ Code used for the Queries module in Sentry """ -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import OP, SPANDATA from sentry_sdk.integrations.redis.utils import _get_safe_command from sentry_sdk.utils import capture_internal_exceptions diff --git a/sentry_sdk/integrations/redis/redis.py b/sentry_sdk/integrations/redis/redis.py index 8359d0fcbe..b6c9cc2d65 100644 --- a/sentry_sdk/integrations/redis/redis.py +++ b/sentry_sdk/integrations/redis/redis.py @@ -4,7 +4,7 @@ https://github.com/redis/redis-py """ -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.integrations.redis._sync_common import ( patch_redis_client, patch_redis_pipeline, diff --git a/sentry_sdk/integrations/redis/redis_cluster.py b/sentry_sdk/integrations/redis/redis_cluster.py index 0f42032e0b..425bf09d64 100644 --- a/sentry_sdk/integrations/redis/redis_cluster.py +++ b/sentry_sdk/integrations/redis/redis_cluster.py @@ -5,7 +5,7 @@ https://github.com/redis/redis-py/blob/master/redis/cluster.py """ -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.integrations.redis._sync_common import ( patch_redis_client, patch_redis_pipeline, diff --git a/sentry_sdk/integrations/redis/utils.py b/sentry_sdk/integrations/redis/utils.py index 43ea5b1572..9c5eac5c99 100644 --- a/sentry_sdk/integrations/redis/utils.py +++ b/sentry_sdk/integrations/redis/utils.py @@ -1,4 +1,4 @@ -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import SPANDATA from sentry_sdk.integrations.redis.consts import ( _COMMANDS_INCLUDING_SENSITIVE_DATA, diff --git a/sentry_sdk/integrations/rq.py b/sentry_sdk/integrations/rq.py index 6afb07c92d..c0df1c5e53 100644 --- a/sentry_sdk/integrations/rq.py +++ b/sentry_sdk/integrations/rq.py @@ -23,7 +23,7 @@ except ImportError: raise DidNotEnable("RQ not installed") -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any, Callable diff --git a/sentry_sdk/integrations/sanic.py b/sentry_sdk/integrations/sanic.py index 36e3b4c892..1d6a233c61 100644 --- a/sentry_sdk/integrations/sanic.py +++ b/sentry_sdk/integrations/sanic.py @@ -19,7 +19,7 @@ parse_version, reraise, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from collections.abc import Container diff --git a/sentry_sdk/integrations/serverless.py b/sentry_sdk/integrations/serverless.py index a8fbc826fd..ec5816e5db 100644 --- a/sentry_sdk/integrations/serverless.py +++ b/sentry_sdk/integrations/serverless.py @@ -3,7 +3,7 @@ import sentry_sdk from sentry_sdk.utils import event_from_exception, reraise -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/spark/spark_driver.py b/sentry_sdk/integrations/spark/spark_driver.py index b55550cbef..c6470f2302 100644 --- a/sentry_sdk/integrations/spark/spark_driver.py +++ b/sentry_sdk/integrations/spark/spark_driver.py @@ -2,7 +2,7 @@ from sentry_sdk.integrations import Integration from sentry_sdk.utils import capture_internal_exceptions, ensure_integration_enabled -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/spark/spark_worker.py b/sentry_sdk/integrations/spark/spark_worker.py index d9e598603e..5340a0b350 100644 --- a/sentry_sdk/integrations/spark/spark_worker.py +++ b/sentry_sdk/integrations/spark/spark_worker.py @@ -10,7 +10,7 @@ event_hint_with_exc_info, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/sqlalchemy.py b/sentry_sdk/integrations/sqlalchemy.py index bcb06e3330..04aaebe295 100644 --- a/sentry_sdk/integrations/sqlalchemy.py +++ b/sentry_sdk/integrations/sqlalchemy.py @@ -1,5 +1,5 @@ import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import SPANSTATUS, SPANDATA from sentry_sdk.db.explain_plan.sqlalchemy import attach_explain_plan_to_span from sentry_sdk.integrations import Integration, DidNotEnable diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py index 3b7aa11a93..2c21f12afd 100644 --- a/sentry_sdk/integrations/starlette.py +++ b/sentry_sdk/integrations/starlette.py @@ -3,7 +3,7 @@ from copy import deepcopy import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.integrations import DidNotEnable, Integration from sentry_sdk.integrations._wsgi_common import ( diff --git a/sentry_sdk/integrations/starlite.py b/sentry_sdk/integrations/starlite.py index 8e72751e95..349a199f20 100644 --- a/sentry_sdk/integrations/starlite.py +++ b/sentry_sdk/integrations/starlite.py @@ -1,5 +1,5 @@ import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.integrations import DidNotEnable, Integration from sentry_sdk.integrations.asgi import SentryAsgiMiddleware diff --git a/sentry_sdk/integrations/stdlib.py b/sentry_sdk/integrations/stdlib.py index ad8e965a4a..7e01011a12 100644 --- a/sentry_sdk/integrations/stdlib.py +++ b/sentry_sdk/integrations/stdlib.py @@ -18,7 +18,7 @@ safe_repr, parse_url, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/strawberry.py b/sentry_sdk/integrations/strawberry.py index 148edac334..ccd504e321 100644 --- a/sentry_sdk/integrations/strawberry.py +++ b/sentry_sdk/integrations/strawberry.py @@ -15,7 +15,7 @@ package_version, _get_installed_modules, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING try: from functools import cached_property diff --git a/sentry_sdk/integrations/threading.py b/sentry_sdk/integrations/threading.py index 6dd6acbae1..9baf0eb85f 100644 --- a/sentry_sdk/integrations/threading.py +++ b/sentry_sdk/integrations/threading.py @@ -3,7 +3,7 @@ from threading import Thread, current_thread import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.integrations import Integration from sentry_sdk.scope import use_isolation_scope, use_scope from sentry_sdk.utils import ( diff --git a/sentry_sdk/integrations/tornado.py b/sentry_sdk/integrations/tornado.py index c459ee8922..f1bd196261 100644 --- a/sentry_sdk/integrations/tornado.py +++ b/sentry_sdk/integrations/tornado.py @@ -33,7 +33,7 @@ except ImportError: raise DidNotEnable("Tornado not installed") -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/wsgi.py b/sentry_sdk/integrations/wsgi.py index 7a95611d78..2ccb67ab7d 100644 --- a/sentry_sdk/integrations/wsgi.py +++ b/sentry_sdk/integrations/wsgi.py @@ -2,7 +2,7 @@ from functools import partial import sentry_sdk -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk._werkzeug import get_host, _get_headers from sentry_sdk.api import continue_trace from sentry_sdk.consts import OP diff --git a/sentry_sdk/metrics.py b/sentry_sdk/metrics.py index 452bb61658..530171ca3c 100644 --- a/sentry_sdk/metrics.py +++ b/sentry_sdk/metrics.py @@ -27,7 +27,7 @@ TRANSACTION_SOURCE_COMPONENT, TRANSACTION_SOURCE_TASK, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/monitor.py b/sentry_sdk/monitor.py index f94e0d4e0d..27707d4cb9 100644 --- a/sentry_sdk/monitor.py +++ b/sentry_sdk/monitor.py @@ -4,7 +4,7 @@ import sentry_sdk from sentry_sdk.utils import logger -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Optional diff --git a/sentry_sdk/profiler/continuous_profiler.py b/sentry_sdk/profiler/continuous_profiler.py index 63a9201b6f..77b3a628ad 100644 --- a/sentry_sdk/profiler/continuous_profiler.py +++ b/sentry_sdk/profiler/continuous_profiler.py @@ -9,7 +9,7 @@ from sentry_sdk.consts import VERSION from sentry_sdk.envelope import Envelope from sentry_sdk._lru_cache import LRUCache -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.profiler.utils import ( DEFAULT_SAMPLING_FREQUENCY, extract_stack, diff --git a/sentry_sdk/profiler/transaction_profiler.py b/sentry_sdk/profiler/transaction_profiler.py index 6ed983fb59..524de41d24 100644 --- a/sentry_sdk/profiler/transaction_profiler.py +++ b/sentry_sdk/profiler/transaction_profiler.py @@ -39,7 +39,7 @@ import sentry_sdk from sentry_sdk._lru_cache import LRUCache -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.profiler.utils import ( DEFAULT_SAMPLING_FREQUENCY, extract_stack, diff --git a/sentry_sdk/profiler/utils.py b/sentry_sdk/profiler/utils.py index 682274d00d..7c8ad9fd86 100644 --- a/sentry_sdk/profiler/utils.py +++ b/sentry_sdk/profiler/utils.py @@ -2,7 +2,7 @@ from collections import deque from sentry_sdk._compat import PY311 -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.utils import filename_for_module if TYPE_CHECKING: diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py index 69037758a2..c647870202 100644 --- a/sentry_sdk/scope.py +++ b/sentry_sdk/scope.py @@ -26,7 +26,7 @@ Span, Transaction, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.utils import ( capture_internal_exception, capture_internal_exceptions, diff --git a/sentry_sdk/scrubber.py b/sentry_sdk/scrubber.py index f1f320786c..1a905da361 100644 --- a/sentry_sdk/scrubber.py +++ b/sentry_sdk/scrubber.py @@ -3,7 +3,7 @@ AnnotatedValue, iter_event_frames, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from sentry_sdk._types import Event diff --git a/sentry_sdk/serializer.py b/sentry_sdk/serializer.py index 7171885f43..16d40ba706 100644 --- a/sentry_sdk/serializer.py +++ b/sentry_sdk/serializer.py @@ -11,7 +11,7 @@ safe_repr, strip_string, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from types import TracebackType diff --git a/sentry_sdk/session.py b/sentry_sdk/session.py index 5c11456430..5cdb93dfb5 100644 --- a/sentry_sdk/session.py +++ b/sentry_sdk/session.py @@ -1,7 +1,7 @@ import uuid from datetime import datetime, timezone -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.utils import format_timestamp if TYPE_CHECKING: diff --git a/sentry_sdk/sessions.py b/sentry_sdk/sessions.py index 66bbdfd5ec..d02ca83465 100644 --- a/sentry_sdk/sessions.py +++ b/sentry_sdk/sessions.py @@ -7,7 +7,7 @@ import sentry_sdk from sentry_sdk.envelope import Envelope from sentry_sdk.session import Session -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.utils import format_timestamp if TYPE_CHECKING: diff --git a/sentry_sdk/spotlight.py b/sentry_sdk/spotlight.py index 3c6a23ed76..3a5a713077 100644 --- a/sentry_sdk/spotlight.py +++ b/sentry_sdk/spotlight.py @@ -1,7 +1,7 @@ import io import urllib3 -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py index b451fcfe0b..50066c994d 100644 --- a/sentry_sdk/tracing.py +++ b/sentry_sdk/tracing.py @@ -12,7 +12,7 @@ logger, nanosecond_time, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from collections.abc import Callable, Mapping, MutableMapping diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py index 0dabfbc486..bd6094b0e6 100644 --- a/sentry_sdk/tracing_utils.py +++ b/sentry_sdk/tracing_utils.py @@ -23,7 +23,7 @@ _is_external_source, _module_in_list, ) -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/transport.py b/sentry_sdk/transport.py index e5c39c48e4..83f9553617 100644 --- a/sentry_sdk/transport.py +++ b/sentry_sdk/transport.py @@ -17,7 +17,7 @@ from sentry_sdk.utils import Dsn, logger, capture_internal_exceptions from sentry_sdk.worker import BackgroundWorker from sentry_sdk.envelope import Envelope, Item, PayloadRef -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py index 2fb7561ac8..c720ba6099 100644 --- a/sentry_sdk/utils.py +++ b/sentry_sdk/utils.py @@ -26,7 +26,7 @@ import sentry_sdk from sentry_sdk._compat import PY37 -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING from sentry_sdk.consts import DEFAULT_MAX_VALUE_LENGTH, EndpointType if TYPE_CHECKING: diff --git a/sentry_sdk/worker.py b/sentry_sdk/worker.py index 2e4c58f46a..b04ea582bc 100644 --- a/sentry_sdk/worker.py +++ b/sentry_sdk/worker.py @@ -6,7 +6,7 @@ from sentry_sdk.utils import logger from sentry_sdk.consts import DEFAULT_QUEUE_SIZE -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/tests/conftest.py b/tests/conftest.py index c31a394fb5..64527c1e36 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -35,7 +35,7 @@ from tests import _warning_recorder, _warning_recorder_mgr -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Optional diff --git a/tests/integrations/sanic/test_sanic.py b/tests/integrations/sanic/test_sanic.py index 598bae0134..9d95907144 100644 --- a/tests/integrations/sanic/test_sanic.py +++ b/tests/integrations/sanic/test_sanic.py @@ -26,7 +26,7 @@ except ImportError: ReusableClient = None -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from collections.abc import Iterable, Container diff --git a/tests/test_client.py b/tests/test_client.py index 1193d50edc..b44dd81bc2 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -27,7 +27,7 @@ from sentry_sdk.transport import Transport from sentry_sdk.serializer import MAX_DATABAG_BREADTH from sentry_sdk.consts import DEFAULT_MAX_BREADCRUMBS, DEFAULT_MAX_VALUE_LENGTH -from sentry_sdk._types import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from collections.abc import Callable From 8fd52deb5264122cfd023567e281704f340a6483 Mon Sep 17 00:00:00 2001 From: Ivana Kellyer Date: Mon, 19 Aug 2024 11:15:58 +0200 Subject: [PATCH 3/3] reorder imports --- scripts/init_serverless_sdk.py | 3 ++- sentry_sdk/ai/monitoring.py | 1 + sentry_sdk/api.py | 1 - sentry_sdk/attachments.py | 3 ++- sentry_sdk/crons/api.py | 2 +- sentry_sdk/crons/decorator.py | 3 ++- sentry_sdk/db/explain_plan/__init__.py | 3 +-- sentry_sdk/db/explain_plan/django.py | 3 ++- sentry_sdk/db/explain_plan/sqlalchemy.py | 3 ++- sentry_sdk/envelope.py | 3 ++- sentry_sdk/integrations/__init__.py | 2 +- sentry_sdk/integrations/_asgi_common.py | 1 + sentry_sdk/integrations/_wsgi_common.py | 2 +- sentry_sdk/integrations/ariadne.py | 2 +- sentry_sdk/integrations/arq.py | 3 ++- sentry_sdk/integrations/asgi.py | 3 ++- sentry_sdk/integrations/asyncio.py | 2 +- sentry_sdk/integrations/atexit.py | 1 + sentry_sdk/integrations/aws_lambda.py | 1 + sentry_sdk/integrations/beam.py | 1 + sentry_sdk/integrations/boto3.py | 4 ++-- sentry_sdk/integrations/bottle.py | 1 + sentry_sdk/integrations/celery/__init__.py | 3 ++- sentry_sdk/integrations/celery/beat.py | 3 ++- sentry_sdk/integrations/celery/utils.py | 4 +--- sentry_sdk/integrations/chalice.py | 3 ++- sentry_sdk/integrations/clickhouse_driver.py | 3 +-- sentry_sdk/integrations/cohere.py | 3 ++- sentry_sdk/integrations/django/__init__.py | 2 +- sentry_sdk/integrations/django/asgi.py | 2 +- sentry_sdk/integrations/django/middleware.py | 3 ++- .../integrations/django/signals_handlers.py | 2 +- sentry_sdk/integrations/django/templates.py | 3 ++- sentry_sdk/integrations/django/views.py | 1 + sentry_sdk/integrations/dramatiq.py | 3 ++- sentry_sdk/integrations/executing.py | 3 ++- sentry_sdk/integrations/fastapi.py | 3 ++- sentry_sdk/integrations/flask.py | 3 ++- sentry_sdk/integrations/graphene.py | 3 +-- sentry_sdk/integrations/grpc/__init__.py | 3 +-- sentry_sdk/integrations/grpc/aio/server.py | 3 ++- sentry_sdk/integrations/grpc/client.py | 3 ++- sentry_sdk/integrations/grpc/server.py | 3 ++- sentry_sdk/integrations/huey.py | 3 ++- sentry_sdk/integrations/langchain.py | 7 ++++--- sentry_sdk/integrations/litestar.py | 4 +++- sentry_sdk/integrations/logging.py | 1 + sentry_sdk/integrations/loguru.py | 3 ++- sentry_sdk/integrations/openai.py | 18 +++++++++--------- .../integrations/opentelemetry/propagator.py | 3 ++- .../opentelemetry/span_processor.py | 3 +-- sentry_sdk/integrations/pure_eval.py | 3 ++- sentry_sdk/integrations/pymongo.py | 4 ++-- sentry_sdk/integrations/pyramid.py | 2 +- sentry_sdk/integrations/redis/__init__.py | 3 ++- sentry_sdk/integrations/redis/_async_common.py | 4 ++-- sentry_sdk/integrations/redis/_sync_common.py | 4 ++-- .../integrations/redis/modules/caches.py | 3 ++- .../integrations/redis/modules/queries.py | 2 +- sentry_sdk/integrations/redis/redis.py | 2 +- sentry_sdk/integrations/redis/redis_cluster.py | 3 ++- sentry_sdk/integrations/redis/utils.py | 2 +- sentry_sdk/integrations/sanic.py | 1 + sentry_sdk/integrations/serverless.py | 2 +- sentry_sdk/integrations/sqlalchemy.py | 3 ++- sentry_sdk/integrations/starlette.py | 3 ++- sentry_sdk/integrations/starlite.py | 3 ++- sentry_sdk/integrations/stdlib.py | 1 + sentry_sdk/integrations/strawberry.py | 3 ++- sentry_sdk/integrations/threading.py | 3 ++- sentry_sdk/integrations/wsgi.py | 3 ++- sentry_sdk/metrics.py | 1 + sentry_sdk/monitor.py | 1 + sentry_sdk/profiler/continuous_profiler.py | 2 +- sentry_sdk/profiler/transaction_profiler.py | 3 ++- sentry_sdk/profiler/utils.py | 3 ++- sentry_sdk/scope.py | 3 ++- sentry_sdk/scrubber.py | 1 + sentry_sdk/serializer.py | 1 + sentry_sdk/session.py | 3 ++- sentry_sdk/sessions.py | 3 ++- sentry_sdk/tracing.py | 1 + sentry_sdk/tracing_utils.py | 1 + sentry_sdk/transport.py | 1 + sentry_sdk/utils.py | 3 ++- tests/test_client.py | 1 + 86 files changed, 142 insertions(+), 89 deletions(-) diff --git a/scripts/init_serverless_sdk.py b/scripts/init_serverless_sdk.py index d5ce6c5b77..9b4412c420 100644 --- a/scripts/init_serverless_sdk.py +++ b/scripts/init_serverless_sdk.py @@ -11,9 +11,10 @@ import re import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.integrations.aws_lambda import AwsLambdaIntegration +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/ai/monitoring.py b/sentry_sdk/ai/monitoring.py index 0fb928b57e..e1679b0bc6 100644 --- a/sentry_sdk/ai/monitoring.py +++ b/sentry_sdk/ai/monitoring.py @@ -5,6 +5,7 @@ from sentry_sdk import start_span from sentry_sdk.tracing import Span from sentry_sdk.utils import ContextVar + from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/api.py b/sentry_sdk/api.py index a723e5a786..d60434079c 100644 --- a/sentry_sdk/api.py +++ b/sentry_sdk/api.py @@ -9,7 +9,6 @@ from sentry_sdk.tracing import NoOpSpan, Transaction, trace from sentry_sdk.crons import monitor - from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/attachments.py b/sentry_sdk/attachments.py index 15723e6f68..e5404f8658 100644 --- a/sentry_sdk/attachments.py +++ b/sentry_sdk/attachments.py @@ -1,9 +1,10 @@ import os import mimetypes -from typing import TYPE_CHECKING from sentry_sdk.envelope import Item, PayloadRef +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Optional, Union, Callable diff --git a/sentry_sdk/crons/api.py b/sentry_sdk/crons/api.py index 5109d17ab0..20e95685a7 100644 --- a/sentry_sdk/crons/api.py +++ b/sentry_sdk/crons/api.py @@ -1,8 +1,8 @@ import uuid import sentry_sdk -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Optional diff --git a/sentry_sdk/crons/decorator.py b/sentry_sdk/crons/decorator.py index ea2c6781a0..9af00e61c0 100644 --- a/sentry_sdk/crons/decorator.py +++ b/sentry_sdk/crons/decorator.py @@ -1,11 +1,12 @@ from functools import wraps from inspect import iscoroutinefunction -from typing import TYPE_CHECKING from sentry_sdk.crons import capture_checkin from sentry_sdk.crons.consts import MonitorStatus from sentry_sdk.utils import now +from typing import TYPE_CHECKING + if TYPE_CHECKING: from collections.abc import Awaitable, Callable from types import TracebackType diff --git a/sentry_sdk/db/explain_plan/__init__.py b/sentry_sdk/db/explain_plan/__init__.py index 39b0e7ba8f..1cc475f0f4 100644 --- a/sentry_sdk/db/explain_plan/__init__.py +++ b/sentry_sdk/db/explain_plan/__init__.py @@ -1,6 +1,5 @@ from datetime import datetime, timedelta, timezone - -from sentry_sdk.consts import TYPE_CHECKING +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/db/explain_plan/django.py b/sentry_sdk/db/explain_plan/django.py index b395f1c82b..21ebc9c81a 100644 --- a/sentry_sdk/db/explain_plan/django.py +++ b/sentry_sdk/db/explain_plan/django.py @@ -1,4 +1,5 @@ -from sentry_sdk.consts import TYPE_CHECKING +from typing import TYPE_CHECKING + from sentry_sdk.db.explain_plan import cache_statement, should_run_explain_plan if TYPE_CHECKING: diff --git a/sentry_sdk/db/explain_plan/sqlalchemy.py b/sentry_sdk/db/explain_plan/sqlalchemy.py index 1ca451e808..9320ff8fb3 100644 --- a/sentry_sdk/db/explain_plan/sqlalchemy.py +++ b/sentry_sdk/db/explain_plan/sqlalchemy.py @@ -1,4 +1,5 @@ -from sentry_sdk.consts import TYPE_CHECKING +from typing import TYPE_CHECKING + from sentry_sdk.db.explain_plan import cache_statement, should_run_explain_plan from sentry_sdk.integrations import DidNotEnable diff --git a/sentry_sdk/envelope.py b/sentry_sdk/envelope.py index 286451832a..1a152b283d 100644 --- a/sentry_sdk/envelope.py +++ b/sentry_sdk/envelope.py @@ -2,10 +2,11 @@ import json import mimetypes -from typing import TYPE_CHECKING from sentry_sdk.session import Session from sentry_sdk.utils import json_dumps, capture_internal_exceptions +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any from typing import Optional diff --git a/sentry_sdk/integrations/__init__.py b/sentry_sdk/integrations/__init__.py index 3def629536..35f809bde7 100644 --- a/sentry_sdk/integrations/__init__.py +++ b/sentry_sdk/integrations/__init__.py @@ -1,9 +1,9 @@ from abc import ABC, abstractmethod from threading import Lock -from typing import TYPE_CHECKING from sentry_sdk.utils import logger +from typing import TYPE_CHECKING if TYPE_CHECKING: from collections.abc import Sequence diff --git a/sentry_sdk/integrations/_asgi_common.py b/sentry_sdk/integrations/_asgi_common.py index 87dcbae248..c16bbbcfe8 100644 --- a/sentry_sdk/integrations/_asgi_common.py +++ b/sentry_sdk/integrations/_asgi_common.py @@ -2,6 +2,7 @@ from sentry_sdk.scope import should_send_default_pii from sentry_sdk.integrations._wsgi_common import _filter_headers + from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/integrations/_wsgi_common.py b/sentry_sdk/integrations/_wsgi_common.py index c6e9f8157d..14a4c4aea4 100644 --- a/sentry_sdk/integrations/_wsgi_common.py +++ b/sentry_sdk/integrations/_wsgi_common.py @@ -4,13 +4,13 @@ import sentry_sdk from sentry_sdk.scope import should_send_default_pii from sentry_sdk.utils import AnnotatedValue, logger -from typing import TYPE_CHECKING try: from django.http.request import RawPostDataException except ImportError: RawPostDataException = None +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/ariadne.py b/sentry_sdk/integrations/ariadne.py index 173d182801..70a3424a48 100644 --- a/sentry_sdk/integrations/ariadne.py +++ b/sentry_sdk/integrations/ariadne.py @@ -12,7 +12,6 @@ event_from_exception, package_version, ) -from typing import TYPE_CHECKING try: # importing like this is necessary due to name shadowing in ariadne @@ -21,6 +20,7 @@ except ImportError: raise DidNotEnable("ariadne is not installed") +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any, Dict, List, Optional diff --git a/sentry_sdk/integrations/arq.py b/sentry_sdk/integrations/arq.py index 5c02cbe481..7a9f7a747d 100644 --- a/sentry_sdk/integrations/arq.py +++ b/sentry_sdk/integrations/arq.py @@ -1,7 +1,6 @@ import sys import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.consts import OP, SPANSTATUS from sentry_sdk.integrations import DidNotEnable, Integration from sentry_sdk.integrations.logging import ignore_logger @@ -24,6 +23,8 @@ except ImportError: raise DidNotEnable("Arq is not installed") +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any, Dict, Optional, Union diff --git a/sentry_sdk/integrations/asgi.py b/sentry_sdk/integrations/asgi.py index 47e8c06e82..33fe18bd82 100644 --- a/sentry_sdk/integrations/asgi.py +++ b/sentry_sdk/integrations/asgi.py @@ -10,7 +10,6 @@ from functools import partial import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.api import continue_trace from sentry_sdk.consts import OP @@ -37,6 +36,8 @@ ) from sentry_sdk.tracing import Transaction +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any from typing import Callable diff --git a/sentry_sdk/integrations/asyncio.py b/sentry_sdk/integrations/asyncio.py index aea5321fe1..313a306164 100644 --- a/sentry_sdk/integrations/asyncio.py +++ b/sentry_sdk/integrations/asyncio.py @@ -3,7 +3,6 @@ import sentry_sdk from sentry_sdk.consts import OP from sentry_sdk.integrations import Integration, DidNotEnable -from typing import TYPE_CHECKING from sentry_sdk.utils import event_from_exception, reraise try: @@ -12,6 +11,7 @@ except ImportError: raise DidNotEnable("asyncio not available") +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/atexit.py b/sentry_sdk/integrations/atexit.py index 8ef2f8aa79..43e25c1848 100644 --- a/sentry_sdk/integrations/atexit.py +++ b/sentry_sdk/integrations/atexit.py @@ -6,6 +6,7 @@ from sentry_sdk.utils import logger from sentry_sdk.integrations import Integration from sentry_sdk.utils import ensure_integration_enabled + from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/integrations/aws_lambda.py b/sentry_sdk/integrations/aws_lambda.py index 96cdb10f24..168b8061aa 100644 --- a/sentry_sdk/integrations/aws_lambda.py +++ b/sentry_sdk/integrations/aws_lambda.py @@ -19,6 +19,7 @@ ) from sentry_sdk.integrations import Integration from sentry_sdk.integrations._wsgi_common import _filter_headers + from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/integrations/beam.py b/sentry_sdk/integrations/beam.py index 3b551694ce..a2e4553f5a 100644 --- a/sentry_sdk/integrations/beam.py +++ b/sentry_sdk/integrations/beam.py @@ -11,6 +11,7 @@ event_from_exception, reraise, ) + from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/integrations/boto3.py b/sentry_sdk/integrations/boto3.py index 9a89d705c6..8a59b9b797 100644 --- a/sentry_sdk/integrations/boto3.py +++ b/sentry_sdk/integrations/boto3.py @@ -4,8 +4,6 @@ from sentry_sdk.consts import OP, SPANDATA from sentry_sdk.integrations import Integration, DidNotEnable from sentry_sdk.tracing import Span - -from typing import TYPE_CHECKING from sentry_sdk.utils import ( capture_internal_exceptions, ensure_integration_enabled, @@ -13,6 +11,8 @@ parse_version, ) +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any from typing import Dict diff --git a/sentry_sdk/integrations/bottle.py b/sentry_sdk/integrations/bottle.py index 863dd26717..b1800bd191 100644 --- a/sentry_sdk/integrations/bottle.py +++ b/sentry_sdk/integrations/bottle.py @@ -10,6 +10,7 @@ from sentry_sdk.integrations import Integration, DidNotEnable from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware from sentry_sdk.integrations._wsgi_common import RequestExtractor + from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/integrations/celery/__init__.py b/sentry_sdk/integrations/celery/__init__.py index 8c470f9607..5b8a90fdb9 100644 --- a/sentry_sdk/integrations/celery/__init__.py +++ b/sentry_sdk/integrations/celery/__init__.py @@ -15,7 +15,6 @@ from sentry_sdk.integrations.celery.utils import _now_seconds_since_epoch from sentry_sdk.integrations.logging import ignore_logger from sentry_sdk.tracing import BAGGAGE_HEADER_NAME, TRANSACTION_SOURCE_TASK -from typing import TYPE_CHECKING from sentry_sdk.tracing_utils import Baggage from sentry_sdk.utils import ( capture_internal_exceptions, @@ -24,6 +23,8 @@ reraise, ) +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any from typing import Callable diff --git a/sentry_sdk/integrations/celery/beat.py b/sentry_sdk/integrations/celery/beat.py index 8ccdf60a12..ddbc8561a4 100644 --- a/sentry_sdk/integrations/celery/beat.py +++ b/sentry_sdk/integrations/celery/beat.py @@ -5,12 +5,13 @@ _get_humanized_interval, _now_seconds_since_epoch, ) -from typing import TYPE_CHECKING from sentry_sdk.utils import ( logger, match_regex_list, ) +from typing import TYPE_CHECKING + if TYPE_CHECKING: from collections.abc import Callable from typing import Any, Optional, TypeVar, Union diff --git a/sentry_sdk/integrations/celery/utils.py b/sentry_sdk/integrations/celery/utils.py index 85066947ac..a1961b15bc 100644 --- a/sentry_sdk/integrations/celery/utils.py +++ b/sentry_sdk/integrations/celery/utils.py @@ -1,7 +1,5 @@ import time -from typing import cast - -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, cast if TYPE_CHECKING: from typing import Any, Tuple diff --git a/sentry_sdk/integrations/chalice.py b/sentry_sdk/integrations/chalice.py index 72e8920c94..0754d1f13b 100644 --- a/sentry_sdk/integrations/chalice.py +++ b/sentry_sdk/integrations/chalice.py @@ -11,7 +11,6 @@ parse_version, reraise, ) -from typing import TYPE_CHECKING try: import chalice # type: ignore @@ -21,6 +20,8 @@ except ImportError: raise DidNotEnable("Chalice is not installed") +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any from typing import Dict diff --git a/sentry_sdk/integrations/clickhouse_driver.py b/sentry_sdk/integrations/clickhouse_driver.py index 6bfbc1e2b4..02707fb7c5 100644 --- a/sentry_sdk/integrations/clickhouse_driver.py +++ b/sentry_sdk/integrations/clickhouse_driver.py @@ -2,11 +2,10 @@ from sentry_sdk.consts import OP, SPANDATA from sentry_sdk.integrations import Integration, DidNotEnable from sentry_sdk.tracing import Span -from typing import TYPE_CHECKING from sentry_sdk.scope import should_send_default_pii from sentry_sdk.utils import capture_internal_exceptions, ensure_integration_enabled -from typing import TypeVar +from typing import TYPE_CHECKING, TypeVar # Hack to get new Python features working in older versions # without introducing a hard dependency on `typing_extensions` diff --git a/sentry_sdk/integrations/cohere.py b/sentry_sdk/integrations/cohere.py index bcd4ef6e23..1d4e86a71b 100644 --- a/sentry_sdk/integrations/cohere.py +++ b/sentry_sdk/integrations/cohere.py @@ -1,11 +1,12 @@ from functools import wraps from sentry_sdk import consts -from typing import TYPE_CHECKING from sentry_sdk.ai.monitoring import record_token_usage from sentry_sdk.consts import SPANDATA from sentry_sdk.ai.utils import set_data_normalized +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any, Callable, Iterator from sentry_sdk.tracing import Span diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py index 951f61943b..8fce1d138e 100644 --- a/sentry_sdk/integrations/django/__init__.py +++ b/sentry_sdk/integrations/django/__init__.py @@ -5,7 +5,6 @@ from importlib import import_module import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.consts import OP, SPANDATA from sentry_sdk.db.explain_plan.django import attach_explain_plan_to_span from sentry_sdk.scope import add_global_event_processor, should_send_default_pii @@ -68,6 +67,7 @@ else: patch_caching = None # type: ignore +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/integrations/django/asgi.py b/sentry_sdk/integrations/django/asgi.py index 2894b2dc86..aa2f3e8c6d 100644 --- a/sentry_sdk/integrations/django/asgi.py +++ b/sentry_sdk/integrations/django/asgi.py @@ -13,7 +13,6 @@ from django.core.handlers.wsgi import WSGIRequest import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.integrations.asgi import SentryAsgiMiddleware @@ -23,6 +22,7 @@ ensure_integration_enabled, ) +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any, Callable, Union, TypeVar diff --git a/sentry_sdk/integrations/django/middleware.py b/sentry_sdk/integrations/django/middleware.py index c7428846ad..1abf6ec4e2 100644 --- a/sentry_sdk/integrations/django/middleware.py +++ b/sentry_sdk/integrations/django/middleware.py @@ -7,7 +7,6 @@ from django import VERSION as DJANGO_VERSION import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.utils import ( ContextVar, @@ -15,6 +14,8 @@ capture_internal_exceptions, ) +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any from typing import Callable diff --git a/sentry_sdk/integrations/django/signals_handlers.py b/sentry_sdk/integrations/django/signals_handlers.py index 7cc73f338d..dd0eabe4a7 100644 --- a/sentry_sdk/integrations/django/signals_handlers.py +++ b/sentry_sdk/integrations/django/signals_handlers.py @@ -3,10 +3,10 @@ from django.dispatch import Signal import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.integrations.django import DJANGO_VERSION +from typing import TYPE_CHECKING if TYPE_CHECKING: from collections.abc import Callable diff --git a/sentry_sdk/integrations/django/templates.py b/sentry_sdk/integrations/django/templates.py index 92fec892d8..6edcdebf73 100644 --- a/sentry_sdk/integrations/django/templates.py +++ b/sentry_sdk/integrations/django/templates.py @@ -5,10 +5,11 @@ from django import VERSION as DJANGO_VERSION import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.utils import ensure_integration_enabled +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any from typing import Dict diff --git a/sentry_sdk/integrations/django/views.py b/sentry_sdk/integrations/django/views.py index fea00e5b03..a81ddd601f 100644 --- a/sentry_sdk/integrations/django/views.py +++ b/sentry_sdk/integrations/django/views.py @@ -2,6 +2,7 @@ import sentry_sdk from sentry_sdk.consts import OP + from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/integrations/dramatiq.py b/sentry_sdk/integrations/dramatiq.py index ce363c9a26..f8f72d0ecd 100644 --- a/sentry_sdk/integrations/dramatiq.py +++ b/sentry_sdk/integrations/dramatiq.py @@ -2,7 +2,6 @@ import sentry_sdk from sentry_sdk.integrations import Integration -from typing import TYPE_CHECKING from sentry_sdk.integrations._wsgi_common import request_body_within_bounds from sentry_sdk.utils import ( AnnotatedValue, @@ -15,6 +14,8 @@ from dramatiq.middleware import Middleware, default_middleware # type: ignore from dramatiq.errors import Retry # type: ignore +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any, Callable, Dict, Optional, Union from sentry_sdk._types import Event, Hint diff --git a/sentry_sdk/integrations/executing.py b/sentry_sdk/integrations/executing.py index 2a6e636a3e..6e68b8c0c7 100644 --- a/sentry_sdk/integrations/executing.py +++ b/sentry_sdk/integrations/executing.py @@ -1,9 +1,10 @@ import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.integrations import Integration, DidNotEnable from sentry_sdk.scope import add_global_event_processor from sentry_sdk.utils import walk_exception_chain, iter_stacks +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Optional diff --git a/sentry_sdk/integrations/fastapi.py b/sentry_sdk/integrations/fastapi.py index f4afa1fdd5..6233a746cc 100644 --- a/sentry_sdk/integrations/fastapi.py +++ b/sentry_sdk/integrations/fastapi.py @@ -3,7 +3,6 @@ from functools import wraps import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.integrations import DidNotEnable from sentry_sdk.scope import should_send_default_pii from sentry_sdk.tracing import SOURCE_FOR_STYLE, TRANSACTION_SOURCE_ROUTE @@ -12,6 +11,8 @@ logger, ) +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any, Callable, Dict from sentry_sdk._types import Event diff --git a/sentry_sdk/integrations/flask.py b/sentry_sdk/integrations/flask.py index 62216134b6..7b0fcf3187 100644 --- a/sentry_sdk/integrations/flask.py +++ b/sentry_sdk/integrations/flask.py @@ -1,5 +1,4 @@ import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.integrations import DidNotEnable, Integration from sentry_sdk.integrations._wsgi_common import RequestExtractor from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware @@ -12,6 +11,8 @@ package_version, ) +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any, Callable, Dict, Union diff --git a/sentry_sdk/integrations/graphene.py b/sentry_sdk/integrations/graphene.py index e3d1f796a2..1b33bf76bf 100644 --- a/sentry_sdk/integrations/graphene.py +++ b/sentry_sdk/integrations/graphene.py @@ -10,14 +10,13 @@ event_from_exception, package_version, ) -from typing import TYPE_CHECKING - try: from graphene.types import schema as graphene_schema # type: ignore except ImportError: raise DidNotEnable("graphene is not installed") +from typing import TYPE_CHECKING if TYPE_CHECKING: from collections.abc import Generator diff --git a/sentry_sdk/integrations/grpc/__init__.py b/sentry_sdk/integrations/grpc/__init__.py index 1a577d4f47..3d949091eb 100644 --- a/sentry_sdk/integrations/grpc/__init__.py +++ b/sentry_sdk/integrations/grpc/__init__.py @@ -6,7 +6,6 @@ from grpc.aio import Server as AsyncServer from sentry_sdk.integrations import Integration -from typing import TYPE_CHECKING from .client import ClientInterceptor from .server import ServerInterceptor @@ -18,7 +17,7 @@ SentryUnaryStreamClientInterceptor as AsyncUnaryStreamClientIntercetor, ) -from typing import Any, Optional, Sequence +from typing import TYPE_CHECKING, Any, Optional, Sequence # Hack to get new Python features working in older versions # without introducing a hard dependency on `typing_extensions` diff --git a/sentry_sdk/integrations/grpc/aio/server.py b/sentry_sdk/integrations/grpc/aio/server.py index 43eaf70508..addc6bee36 100644 --- a/sentry_sdk/integrations/grpc/aio/server.py +++ b/sentry_sdk/integrations/grpc/aio/server.py @@ -1,11 +1,12 @@ import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.integrations import DidNotEnable from sentry_sdk.integrations.grpc.consts import SPAN_ORIGIN from sentry_sdk.tracing import Transaction, TRANSACTION_SOURCE_CUSTOM from sentry_sdk.utils import event_from_exception +from typing import TYPE_CHECKING + if TYPE_CHECKING: from collections.abc import Awaitable, Callable from typing import Any, Optional diff --git a/sentry_sdk/integrations/grpc/client.py b/sentry_sdk/integrations/grpc/client.py index e268c20ae9..2155824eaf 100644 --- a/sentry_sdk/integrations/grpc/client.py +++ b/sentry_sdk/integrations/grpc/client.py @@ -1,9 +1,10 @@ import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.integrations import DidNotEnable from sentry_sdk.integrations.grpc.consts import SPAN_ORIGIN +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any, Callable, Iterator, Iterable, Union diff --git a/sentry_sdk/integrations/grpc/server.py b/sentry_sdk/integrations/grpc/server.py index d769c2a353..a640df5e11 100644 --- a/sentry_sdk/integrations/grpc/server.py +++ b/sentry_sdk/integrations/grpc/server.py @@ -1,10 +1,11 @@ import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.integrations import DidNotEnable from sentry_sdk.integrations.grpc.consts import SPAN_ORIGIN from sentry_sdk.tracing import Transaction, TRANSACTION_SOURCE_CUSTOM +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Callable, Optional from google.protobuf.message import Message diff --git a/sentry_sdk/integrations/huey.py b/sentry_sdk/integrations/huey.py index 14fa5353e9..98fab46711 100644 --- a/sentry_sdk/integrations/huey.py +++ b/sentry_sdk/integrations/huey.py @@ -2,7 +2,6 @@ from datetime import datetime import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.api import continue_trace, get_baggage, get_traceparent from sentry_sdk.consts import OP, SPANSTATUS from sentry_sdk.integrations import DidNotEnable, Integration @@ -20,6 +19,8 @@ reraise, ) +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any, Callable, Optional, Union, TypeVar diff --git a/sentry_sdk/integrations/langchain.py b/sentry_sdk/integrations/langchain.py index eb6257fcbc..a77dec430d 100644 --- a/sentry_sdk/integrations/langchain.py +++ b/sentry_sdk/integrations/langchain.py @@ -2,18 +2,19 @@ from functools import wraps import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.ai.monitoring import set_ai_pipeline_name, record_token_usage from sentry_sdk.consts import OP, SPANDATA from sentry_sdk.ai.utils import set_data_normalized from sentry_sdk.scope import should_send_default_pii from sentry_sdk.tracing import Span +from sentry_sdk.integrations import DidNotEnable, Integration +from sentry_sdk.utils import logger, capture_internal_exceptions + +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any, List, Callable, Dict, Union, Optional from uuid import UUID -from sentry_sdk.integrations import DidNotEnable, Integration -from sentry_sdk.utils import logger, capture_internal_exceptions try: from langchain_core.messages import BaseMessage diff --git a/sentry_sdk/integrations/litestar.py b/sentry_sdk/integrations/litestar.py index 0795414a20..bf4fdf49bf 100644 --- a/sentry_sdk/integrations/litestar.py +++ b/sentry_sdk/integrations/litestar.py @@ -1,5 +1,4 @@ import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.integrations import DidNotEnable, Integration from sentry_sdk.integrations.asgi import SentryAsgiMiddleware @@ -20,6 +19,9 @@ from litestar.data_extractors import ConnectionDataExtractor # type: ignore except ImportError: raise DidNotEnable("Litestar is not installed") + +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any, Optional, Union from litestar.types.asgi_types import ASGIApp # type: ignore diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py index 6aa4563421..103c4ab7b6 100644 --- a/sentry_sdk/integrations/logging.py +++ b/sentry_sdk/integrations/logging.py @@ -10,6 +10,7 @@ capture_internal_exceptions, ) from sentry_sdk.integrations import Integration + from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/integrations/loguru.py b/sentry_sdk/integrations/loguru.py index 4d7ead452e..da99dfc4d6 100644 --- a/sentry_sdk/integrations/loguru.py +++ b/sentry_sdk/integrations/loguru.py @@ -1,6 +1,5 @@ import enum -from typing import TYPE_CHECKING from sentry_sdk.integrations import Integration, DidNotEnable from sentry_sdk.integrations.logging import ( BreadcrumbHandler, @@ -8,6 +7,8 @@ _BaseHandler, ) +from typing import TYPE_CHECKING + if TYPE_CHECKING: from logging import LogRecord from typing import Optional, Tuple diff --git a/sentry_sdk/integrations/openai.py b/sentry_sdk/integrations/openai.py index 616ee71ee9..5cf0817c87 100644 --- a/sentry_sdk/integrations/openai.py +++ b/sentry_sdk/integrations/openai.py @@ -1,24 +1,24 @@ from functools import wraps +import sentry_sdk from sentry_sdk import consts -from typing import TYPE_CHECKING from sentry_sdk.ai.monitoring import record_token_usage -from sentry_sdk.consts import SPANDATA from sentry_sdk.ai.utils import set_data_normalized - -if TYPE_CHECKING: - from typing import Any, Iterable, List, Optional, Callable, Iterator - from sentry_sdk.tracing import Span - -import sentry_sdk -from sentry_sdk.scope import should_send_default_pii +from sentry_sdk.consts import SPANDATA from sentry_sdk.integrations import DidNotEnable, Integration +from sentry_sdk.scope import should_send_default_pii from sentry_sdk.utils import ( capture_internal_exceptions, event_from_exception, ensure_integration_enabled, ) +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from typing import Any, Iterable, List, Optional, Callable, Iterator + from sentry_sdk.tracing import Span + try: from openai.resources.chat.completions import Completions from openai.resources import Embeddings diff --git a/sentry_sdk/integrations/opentelemetry/propagator.py b/sentry_sdk/integrations/opentelemetry/propagator.py index a92b95b177..b84d582d6e 100644 --- a/sentry_sdk/integrations/opentelemetry/propagator.py +++ b/sentry_sdk/integrations/opentelemetry/propagator.py @@ -18,7 +18,6 @@ TraceFlags, ) -from typing import TYPE_CHECKING from sentry_sdk.integrations.opentelemetry.consts import ( SENTRY_BAGGAGE_KEY, SENTRY_TRACE_KEY, @@ -32,6 +31,8 @@ ) from sentry_sdk.tracing_utils import Baggage, extract_sentrytrace_data +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Optional, Set diff --git a/sentry_sdk/integrations/opentelemetry/span_processor.py b/sentry_sdk/integrations/opentelemetry/span_processor.py index 47f2f5df33..1a2951983e 100644 --- a/sentry_sdk/integrations/opentelemetry/span_processor.py +++ b/sentry_sdk/integrations/opentelemetry/span_processor.py @@ -1,6 +1,6 @@ from datetime import datetime, timezone from time import time -from typing import cast +from typing import TYPE_CHECKING, cast from opentelemetry.context import get_value from opentelemetry.sdk.trace import SpanProcessor, ReadableSpan as OTelSpan @@ -24,7 +24,6 @@ from sentry_sdk.scope import add_global_event_processor from sentry_sdk.tracing import Transaction, Span as SentrySpan from sentry_sdk.utils import Dsn -from typing import TYPE_CHECKING from urllib3.util import parse_url as urlparse diff --git a/sentry_sdk/integrations/pure_eval.py b/sentry_sdk/integrations/pure_eval.py index fd929d214e..c1c3d63871 100644 --- a/sentry_sdk/integrations/pure_eval.py +++ b/sentry_sdk/integrations/pure_eval.py @@ -2,11 +2,12 @@ import sentry_sdk from sentry_sdk import serializer -from typing import TYPE_CHECKING from sentry_sdk.integrations import Integration, DidNotEnable from sentry_sdk.scope import add_global_event_processor from sentry_sdk.utils import walk_exception_chain, iter_stacks +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Optional, Dict, Any, Tuple, List from types import FrameType diff --git a/sentry_sdk/integrations/pymongo.py b/sentry_sdk/integrations/pymongo.py index 0c25c9d1d6..ebfaa19766 100644 --- a/sentry_sdk/integrations/pymongo.py +++ b/sentry_sdk/integrations/pymongo.py @@ -8,13 +8,13 @@ from sentry_sdk.tracing import Span from sentry_sdk.utils import capture_internal_exceptions -from typing import TYPE_CHECKING - try: from pymongo import monitoring except ImportError: raise DidNotEnable("Pymongo not installed") +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any, Dict, Union diff --git a/sentry_sdk/integrations/pyramid.py b/sentry_sdk/integrations/pyramid.py index 4ee4735ff8..3ef7000343 100644 --- a/sentry_sdk/integrations/pyramid.py +++ b/sentry_sdk/integrations/pyramid.py @@ -14,7 +14,6 @@ event_from_exception, reraise, ) -from typing import TYPE_CHECKING try: from pyramid.httpexceptions import HTTPException @@ -22,6 +21,7 @@ except ImportError: raise DidNotEnable("Pyramid not installed") +from typing import TYPE_CHECKING if TYPE_CHECKING: from pyramid.response import Response diff --git a/sentry_sdk/integrations/redis/__init__.py b/sentry_sdk/integrations/redis/__init__.py index a1a559da86..f443138295 100644 --- a/sentry_sdk/integrations/redis/__init__.py +++ b/sentry_sdk/integrations/redis/__init__.py @@ -1,4 +1,3 @@ -from typing import TYPE_CHECKING from sentry_sdk.integrations import Integration, DidNotEnable from sentry_sdk.integrations.redis.consts import _DEFAULT_MAX_DATA_SIZE from sentry_sdk.integrations.redis.rb import _patch_rb @@ -7,6 +6,8 @@ from sentry_sdk.integrations.redis.redis_py_cluster_legacy import _patch_rediscluster from sentry_sdk.utils import logger +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Optional diff --git a/sentry_sdk/integrations/redis/_async_common.py b/sentry_sdk/integrations/redis/_async_common.py index 5bb2f08839..d311b3fa0f 100644 --- a/sentry_sdk/integrations/redis/_async_common.py +++ b/sentry_sdk/integrations/redis/_async_common.py @@ -1,4 +1,4 @@ -from typing import TYPE_CHECKING +import sentry_sdk from sentry_sdk.consts import OP from sentry_sdk.integrations.redis.consts import SPAN_ORIGIN from sentry_sdk.integrations.redis.modules.caches import ( @@ -12,8 +12,8 @@ ) from sentry_sdk.tracing import Span from sentry_sdk.utils import capture_internal_exceptions -import sentry_sdk +from typing import TYPE_CHECKING if TYPE_CHECKING: from collections.abc import Callable diff --git a/sentry_sdk/integrations/redis/_sync_common.py b/sentry_sdk/integrations/redis/_sync_common.py index 74729d7302..177e89143d 100644 --- a/sentry_sdk/integrations/redis/_sync_common.py +++ b/sentry_sdk/integrations/redis/_sync_common.py @@ -1,4 +1,4 @@ -from typing import TYPE_CHECKING +import sentry_sdk from sentry_sdk.consts import OP from sentry_sdk.integrations.redis.consts import SPAN_ORIGIN from sentry_sdk.integrations.redis.modules.caches import ( @@ -12,8 +12,8 @@ ) from sentry_sdk.tracing import Span from sentry_sdk.utils import capture_internal_exceptions -import sentry_sdk +from typing import TYPE_CHECKING if TYPE_CHECKING: from collections.abc import Callable diff --git a/sentry_sdk/integrations/redis/modules/caches.py b/sentry_sdk/integrations/redis/modules/caches.py index c6613b4764..c6fc19f5b2 100644 --- a/sentry_sdk/integrations/redis/modules/caches.py +++ b/sentry_sdk/integrations/redis/modules/caches.py @@ -2,7 +2,6 @@ Code used for the Caches module in Sentry """ -from typing import TYPE_CHECKING from sentry_sdk.consts import OP, SPANDATA from sentry_sdk.integrations.redis.utils import _get_safe_key, _key_as_string from sentry_sdk.utils import capture_internal_exceptions @@ -10,6 +9,8 @@ GET_COMMANDS = ("get", "mget") SET_COMMANDS = ("set", "setex") +from typing import TYPE_CHECKING + if TYPE_CHECKING: from sentry_sdk.integrations.redis import RedisIntegration from sentry_sdk.tracing import Span diff --git a/sentry_sdk/integrations/redis/modules/queries.py b/sentry_sdk/integrations/redis/modules/queries.py index a6865d32a8..e0d85a4ef7 100644 --- a/sentry_sdk/integrations/redis/modules/queries.py +++ b/sentry_sdk/integrations/redis/modules/queries.py @@ -2,11 +2,11 @@ Code used for the Queries module in Sentry """ -from typing import TYPE_CHECKING from sentry_sdk.consts import OP, SPANDATA from sentry_sdk.integrations.redis.utils import _get_safe_command from sentry_sdk.utils import capture_internal_exceptions +from typing import TYPE_CHECKING if TYPE_CHECKING: from redis import Redis diff --git a/sentry_sdk/integrations/redis/redis.py b/sentry_sdk/integrations/redis/redis.py index b6c9cc2d65..c92958a32d 100644 --- a/sentry_sdk/integrations/redis/redis.py +++ b/sentry_sdk/integrations/redis/redis.py @@ -4,13 +4,13 @@ https://github.com/redis/redis-py """ -from typing import TYPE_CHECKING from sentry_sdk.integrations.redis._sync_common import ( patch_redis_client, patch_redis_pipeline, ) from sentry_sdk.integrations.redis.modules.queries import _set_db_data +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any, Sequence diff --git a/sentry_sdk/integrations/redis/redis_cluster.py b/sentry_sdk/integrations/redis/redis_cluster.py index 425bf09d64..80cdc7235a 100644 --- a/sentry_sdk/integrations/redis/redis_cluster.py +++ b/sentry_sdk/integrations/redis/redis_cluster.py @@ -5,7 +5,6 @@ https://github.com/redis/redis-py/blob/master/redis/cluster.py """ -from typing import TYPE_CHECKING from sentry_sdk.integrations.redis._sync_common import ( patch_redis_client, patch_redis_pipeline, @@ -15,6 +14,8 @@ from sentry_sdk.utils import capture_internal_exceptions +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any from redis import RedisCluster diff --git a/sentry_sdk/integrations/redis/utils.py b/sentry_sdk/integrations/redis/utils.py index 9c5eac5c99..27fae1e8ca 100644 --- a/sentry_sdk/integrations/redis/utils.py +++ b/sentry_sdk/integrations/redis/utils.py @@ -1,4 +1,3 @@ -from typing import TYPE_CHECKING from sentry_sdk.consts import SPANDATA from sentry_sdk.integrations.redis.consts import ( _COMMANDS_INCLUDING_SENSITIVE_DATA, @@ -10,6 +9,7 @@ from sentry_sdk.scope import should_send_default_pii from sentry_sdk.utils import SENSITIVE_DATA_SUBSTITUTE +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any, Optional, Sequence diff --git a/sentry_sdk/integrations/sanic.py b/sentry_sdk/integrations/sanic.py index 1d6a233c61..e2f24e5b6b 100644 --- a/sentry_sdk/integrations/sanic.py +++ b/sentry_sdk/integrations/sanic.py @@ -19,6 +19,7 @@ parse_version, reraise, ) + from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/integrations/serverless.py b/sentry_sdk/integrations/serverless.py index ec5816e5db..760c07ffad 100644 --- a/sentry_sdk/integrations/serverless.py +++ b/sentry_sdk/integrations/serverless.py @@ -3,6 +3,7 @@ import sentry_sdk from sentry_sdk.utils import event_from_exception, reraise + from typing import TYPE_CHECKING if TYPE_CHECKING: @@ -11,7 +12,6 @@ from typing import TypeVar from typing import Union from typing import Optional - from typing import overload F = TypeVar("F", bound=Callable[..., Any]) diff --git a/sentry_sdk/integrations/sqlalchemy.py b/sentry_sdk/integrations/sqlalchemy.py index 04aaebe295..a968b7db9e 100644 --- a/sentry_sdk/integrations/sqlalchemy.py +++ b/sentry_sdk/integrations/sqlalchemy.py @@ -1,5 +1,4 @@ import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.consts import SPANSTATUS, SPANDATA from sentry_sdk.db.explain_plan.sqlalchemy import attach_explain_plan_to_span from sentry_sdk.integrations import Integration, DidNotEnable @@ -17,6 +16,8 @@ except ImportError: raise DidNotEnable("SQLAlchemy not installed.") +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any from typing import ContextManager diff --git a/sentry_sdk/integrations/starlette.py b/sentry_sdk/integrations/starlette.py index 2c21f12afd..9df30fba72 100644 --- a/sentry_sdk/integrations/starlette.py +++ b/sentry_sdk/integrations/starlette.py @@ -3,7 +3,6 @@ from copy import deepcopy import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.integrations import DidNotEnable, Integration from sentry_sdk.integrations._wsgi_common import ( @@ -28,6 +27,8 @@ transaction_from_function, ) +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any, Awaitable, Callable, Dict, Optional, Tuple diff --git a/sentry_sdk/integrations/starlite.py b/sentry_sdk/integrations/starlite.py index 349a199f20..72bea97854 100644 --- a/sentry_sdk/integrations/starlite.py +++ b/sentry_sdk/integrations/starlite.py @@ -1,5 +1,4 @@ import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.consts import OP from sentry_sdk.integrations import DidNotEnable, Integration from sentry_sdk.integrations.asgi import SentryAsgiMiddleware @@ -22,6 +21,8 @@ except ImportError: raise DidNotEnable("Starlite is not installed") +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any, Optional, Union from starlite.types import ( # type: ignore diff --git a/sentry_sdk/integrations/stdlib.py b/sentry_sdk/integrations/stdlib.py index 7e01011a12..bef29ebec7 100644 --- a/sentry_sdk/integrations/stdlib.py +++ b/sentry_sdk/integrations/stdlib.py @@ -18,6 +18,7 @@ safe_repr, parse_url, ) + from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/integrations/strawberry.py b/sentry_sdk/integrations/strawberry.py index ccd504e321..6070ac3252 100644 --- a/sentry_sdk/integrations/strawberry.py +++ b/sentry_sdk/integrations/strawberry.py @@ -15,7 +15,6 @@ package_version, _get_installed_modules, ) -from typing import TYPE_CHECKING try: from functools import cached_property @@ -39,6 +38,8 @@ except ImportError: raise DidNotEnable("strawberry-graphql is not installed") +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any, Callable, Generator, List, Optional from graphql import GraphQLError, GraphQLResolveInfo # type: ignore diff --git a/sentry_sdk/integrations/threading.py b/sentry_sdk/integrations/threading.py index 9baf0eb85f..c729e208a5 100644 --- a/sentry_sdk/integrations/threading.py +++ b/sentry_sdk/integrations/threading.py @@ -3,7 +3,6 @@ from threading import Thread, current_thread import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk.integrations import Integration from sentry_sdk.scope import use_isolation_scope, use_scope from sentry_sdk.utils import ( @@ -14,6 +13,8 @@ reraise, ) +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any from typing import TypeVar diff --git a/sentry_sdk/integrations/wsgi.py b/sentry_sdk/integrations/wsgi.py index 2ccb67ab7d..00aad30854 100644 --- a/sentry_sdk/integrations/wsgi.py +++ b/sentry_sdk/integrations/wsgi.py @@ -2,7 +2,6 @@ from functools import partial import sentry_sdk -from typing import TYPE_CHECKING from sentry_sdk._werkzeug import get_host, _get_headers from sentry_sdk.api import continue_trace from sentry_sdk.consts import OP @@ -18,6 +17,8 @@ reraise, ) +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Callable from typing import Dict diff --git a/sentry_sdk/metrics.py b/sentry_sdk/metrics.py index 530171ca3c..05dc13042c 100644 --- a/sentry_sdk/metrics.py +++ b/sentry_sdk/metrics.py @@ -27,6 +27,7 @@ TRANSACTION_SOURCE_COMPONENT, TRANSACTION_SOURCE_TASK, ) + from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/monitor.py b/sentry_sdk/monitor.py index 27707d4cb9..68d9017bf9 100644 --- a/sentry_sdk/monitor.py +++ b/sentry_sdk/monitor.py @@ -4,6 +4,7 @@ import sentry_sdk from sentry_sdk.utils import logger + from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/profiler/continuous_profiler.py b/sentry_sdk/profiler/continuous_profiler.py index 77b3a628ad..d3f3438357 100644 --- a/sentry_sdk/profiler/continuous_profiler.py +++ b/sentry_sdk/profiler/continuous_profiler.py @@ -9,7 +9,6 @@ from sentry_sdk.consts import VERSION from sentry_sdk.envelope import Envelope from sentry_sdk._lru_cache import LRUCache -from typing import TYPE_CHECKING from sentry_sdk.profiler.utils import ( DEFAULT_SAMPLING_FREQUENCY, extract_stack, @@ -22,6 +21,7 @@ set_in_app_in_frames, ) +from typing import TYPE_CHECKING if TYPE_CHECKING: from typing import Any diff --git a/sentry_sdk/profiler/transaction_profiler.py b/sentry_sdk/profiler/transaction_profiler.py index 524de41d24..f579c441fa 100644 --- a/sentry_sdk/profiler/transaction_profiler.py +++ b/sentry_sdk/profiler/transaction_profiler.py @@ -39,7 +39,6 @@ import sentry_sdk from sentry_sdk._lru_cache import LRUCache -from typing import TYPE_CHECKING from sentry_sdk.profiler.utils import ( DEFAULT_SAMPLING_FREQUENCY, extract_stack, @@ -54,6 +53,8 @@ set_in_app_in_frames, ) +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any from typing import Callable diff --git a/sentry_sdk/profiler/utils.py b/sentry_sdk/profiler/utils.py index 7c8ad9fd86..e78ea54256 100644 --- a/sentry_sdk/profiler/utils.py +++ b/sentry_sdk/profiler/utils.py @@ -2,9 +2,10 @@ from collections import deque from sentry_sdk._compat import PY311 -from typing import TYPE_CHECKING from sentry_sdk.utils import filename_for_module +from typing import TYPE_CHECKING + if TYPE_CHECKING: from sentry_sdk._lru_cache import LRUCache from types import FrameType diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py index c647870202..83cb1e5cbe 100644 --- a/sentry_sdk/scope.py +++ b/sentry_sdk/scope.py @@ -26,7 +26,6 @@ Span, Transaction, ) -from typing import TYPE_CHECKING from sentry_sdk.utils import ( capture_internal_exception, capture_internal_exceptions, @@ -37,6 +36,8 @@ logger, ) +from typing import TYPE_CHECKING + if TYPE_CHECKING: from collections.abc import Mapping, MutableMapping diff --git a/sentry_sdk/scrubber.py b/sentry_sdk/scrubber.py index 1a905da361..8eb0194418 100644 --- a/sentry_sdk/scrubber.py +++ b/sentry_sdk/scrubber.py @@ -3,6 +3,7 @@ AnnotatedValue, iter_event_frames, ) + from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/serializer.py b/sentry_sdk/serializer.py index 16d40ba706..bc8e38c631 100644 --- a/sentry_sdk/serializer.py +++ b/sentry_sdk/serializer.py @@ -11,6 +11,7 @@ safe_repr, strip_string, ) + from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/session.py b/sentry_sdk/session.py index 5cdb93dfb5..c1d422c115 100644 --- a/sentry_sdk/session.py +++ b/sentry_sdk/session.py @@ -1,9 +1,10 @@ import uuid from datetime import datetime, timezone -from typing import TYPE_CHECKING from sentry_sdk.utils import format_timestamp +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Optional from typing import Union diff --git a/sentry_sdk/sessions.py b/sentry_sdk/sessions.py index d02ca83465..eaeb915e7b 100644 --- a/sentry_sdk/sessions.py +++ b/sentry_sdk/sessions.py @@ -7,9 +7,10 @@ import sentry_sdk from sentry_sdk.envelope import Envelope from sentry_sdk.session import Session -from typing import TYPE_CHECKING from sentry_sdk.utils import format_timestamp +from typing import TYPE_CHECKING + if TYPE_CHECKING: from typing import Any from typing import Callable diff --git a/sentry_sdk/tracing.py b/sentry_sdk/tracing.py index 50066c994d..3ca9744b54 100644 --- a/sentry_sdk/tracing.py +++ b/sentry_sdk/tracing.py @@ -12,6 +12,7 @@ logger, nanosecond_time, ) + from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/tracing_utils.py b/sentry_sdk/tracing_utils.py index bd6094b0e6..be3184ffcc 100644 --- a/sentry_sdk/tracing_utils.py +++ b/sentry_sdk/tracing_utils.py @@ -23,6 +23,7 @@ _is_external_source, _module_in_list, ) + from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/transport.py b/sentry_sdk/transport.py index 83f9553617..6685d5c159 100644 --- a/sentry_sdk/transport.py +++ b/sentry_sdk/transport.py @@ -17,6 +17,7 @@ from sentry_sdk.utils import Dsn, logger, capture_internal_exceptions from sentry_sdk.worker import BackgroundWorker from sentry_sdk.envelope import Envelope, Item, PayloadRef + from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/sentry_sdk/utils.py b/sentry_sdk/utils.py index c720ba6099..6c64fcbece 100644 --- a/sentry_sdk/utils.py +++ b/sentry_sdk/utils.py @@ -26,9 +26,10 @@ import sentry_sdk from sentry_sdk._compat import PY37 -from typing import TYPE_CHECKING from sentry_sdk.consts import DEFAULT_MAX_VALUE_LENGTH, EndpointType +from typing import TYPE_CHECKING + if TYPE_CHECKING: from collections.abc import Awaitable diff --git a/tests/test_client.py b/tests/test_client.py index b44dd81bc2..60799abc58 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -27,6 +27,7 @@ from sentry_sdk.transport import Transport from sentry_sdk.serializer import MAX_DATABAG_BREADTH from sentry_sdk.consts import DEFAULT_MAX_BREADCRUMBS, DEFAULT_MAX_VALUE_LENGTH + from typing import TYPE_CHECKING if TYPE_CHECKING: