Skip to content

Commit 9090ac8

Browse files
committed
use SnubaCondition type in more places
1 parent 514050e commit 9090ac8

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

src/sentry/tsdb/base.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
TSDBKey = TypeVar("TSDBKey", str, int)
1717
TSDBItem = TypeVar("TSDBItem", str, int)
18+
SnubaCondition = tuple[str, str, Any]
1819

1920

2021
class IncrMultiOptions(TypedDict):
@@ -446,7 +447,7 @@ def get_sums(
446447
jitter_value: int | None = None,
447448
tenant_ids: dict[str, str | int] | None = None,
448449
referrer_suffix: str | None = None,
449-
conditions: list[tuple[str, str, Any]] | None = None,
450+
conditions: list[SnubaCondition] | None = None,
450451
) -> dict[int, int]:
451452
range_set = self.get_range(
452453
model,
@@ -546,7 +547,7 @@ def get_distinct_counts_totals(
546547
jitter_value: int | None = None,
547548
tenant_ids: dict[str, int | str] | None = None,
548549
referrer_suffix: str | None = None,
549-
conditions: list[tuple[str, str, Any]] | None = None,
550+
conditions: list[SnubaCondition] | None = None,
550551
) -> dict[int, Any]:
551552
"""
552553
Count distinct items during a time range with optional conditions

src/sentry/tsdb/redis.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@
1313
from django.utils.encoding import force_bytes
1414
from redis.client import Script
1515

16-
from sentry.tsdb.base import BaseTSDB, IncrMultiOptions, TSDBItem, TSDBKey, TSDBModel
16+
from sentry.tsdb.base import (
17+
BaseTSDB,
18+
IncrMultiOptions,
19+
SnubaCondition,
20+
TSDBItem,
21+
TSDBKey,
22+
TSDBModel,
23+
)
1724
from sentry.utils.dates import to_datetime
1825
from sentry.utils.redis import check_cluster_versions, get_cluster_from_options, load_redis_script
1926
from sentry.utils.versioning import Version
@@ -530,7 +537,7 @@ def get_distinct_counts_totals(
530537
jitter_value: int | None = None,
531538
tenant_ids: dict[str, int | str] | None = None,
532539
referrer_suffix: str | None = None,
533-
conditions: list[tuple[str, str, Any]] | None = None,
540+
conditions: list[SnubaCondition] | None = None,
534541
) -> dict[int, Any]:
535542
"""
536543
Count distinct items during a time range.

src/sentry/workflow_engine/handlers/condition/slow_condition_query_handlers.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@
2525
STANDARD_INTERVALS,
2626
)
2727
from sentry.rules.match import MatchType
28-
from sentry.tsdb.base import TSDBModel
28+
from sentry.tsdb.base import SnubaCondition, TSDBModel
2929
from sentry.utils.iterators import chunked
3030
from sentry.utils.registry import Registry
3131
from sentry.utils.snuba import options_override
3232
from sentry.workflow_engine.models.data_condition import Condition
3333

3434
QueryFilter = dict[str, Any]
35-
SnubaCondition = tuple[str, str, Any]
3635

3736

3837
class TSDBFunction(Protocol):

0 commit comments

Comments
 (0)