Skip to content

typing: Remove organization_events_meta from soft list #104102

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 1, 2025
Merged

typing: Remove organization_events_meta from soft list #104102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a7b28b
typing: Remove organization_events_meta.py from soft list
armenzg Nov 27, 2025
3f4af09
More typing
armenzg Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ ignore_missing_imports = true
# - python3 -m tools.mypy_helpers.find_easiest_modules
[[tool.mypy.overrides]]
module = [
"sentry.api.endpoints.organization_events_meta",
"sentry.api.endpoints.organization_releases",
"sentry.api.paginator",
"sentry.db.postgres.base",
Expand Down
21 changes: 14 additions & 7 deletions src/sentry/api/endpoints/organization_events_meta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,17 @@ def get(self, request: Request, organization: Organization) -> Response:
with handle_query_errors():
with sentry_sdk.start_span(op="discover.endpoint", name="filter_creation"):
projects = self.get_projects(request, organization)
# Filter out None values from environments
environments = [e for e in snuba_params.environments if e is not None]
query_kwargs = build_query_params_from_request(
request, organization, projects, snuba_params.environments
request, organization, projects, environments
)
query_kwargs["limit"] = 5
try:
# Need to escape quotes in case some "joker" has a transaction with quotes
transaction_name = UNESCAPED_QUOTE_RE.sub('\\"', lookup_keys["transaction"])
transaction_name = UNESCAPED_QUOTE_RE.sub(
'\\"', lookup_keys["transaction"] or ""
)
parsed_terms = parse_search_query(f'transaction:"{transaction_name}"')
except ParseError:
return Response({"detail": "Invalid transaction search"}, status=400)
Expand Down Expand Up @@ -198,11 +202,13 @@ def get(self, request: Request, organization: Organization) -> Response:

with handle_query_errors():
if use_eap:
result = get_eap_span_samples(request, snuba_params, orderby)
result: EAPResponse | EventsResponse = get_eap_span_samples(
request, snuba_params, orderby
)
dataset = Spans
else:
result = get_span_samples(request, snuba_params, orderby)
dataset = spans_indexed
dataset = spans_indexed # type: ignore[assignment]

return Response(
self.handle_results_with_meta(
Expand Down Expand Up @@ -282,9 +288,10 @@ def get_span_samples(
span_ids.append(top)

if len(span_ids) > 0:
query = f"span_id:[{','.join(span_ids)}] {request.query_params.get('query')}"
user_query = request.query_params.get("query") or ""
query = f"span_id:[{','.join(span_ids)}] {user_query}"
else:
query = request.query_params.get("query")
query = request.query_params.get("query") or ""

return spans_indexed.query(
selected_columns=selected_columns,
Expand Down Expand Up @@ -320,7 +327,7 @@ def get_eap_span_samples(
"trace",
]

query_string = request.query_params.get("query")
query_string = request.query_params.get("query") or ""
bounds_query_string = f"{column}:>{lower_bound}ms {column}:<{upper_bound}ms {query_string}"

rpc_res = Spans.run_table_query(
Expand Down
Loading