Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 30 additions & 7 deletions src/sentry/seer/endpoints/organization_seer_agent_chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
)
from sentry.seer.endpoints.utils import ResolvedSeerRun, resolve_seer_run
from sentry.seer.models import SeerApiError, SeerPermissionError
from sentry.seer.models.run import SeerAgentRun
from sentry.seer.seer_setup import has_seer_access_with_detail
from sentry.types.ratelimit import RateLimit, RateLimitCategory
from sentry.utils import json
Expand All @@ -38,6 +39,8 @@

_CODE_MODE_VALUES = frozenset({"off", "on", "only"})

_DASHBOARD_GENERATE_RUN_SOURCE = "dashboard_generate"


class SeerAgentChatStateResponse(BaseModel):
session: SeerRunState
Expand Down Expand Up @@ -196,6 +199,19 @@ def has_object_permission(self, request: Request, view: APIView, obj: Any) -> bo
return super().has_object_permission(request, view, obj)


def _is_dashboard_generate_run(organization: Organization, resolved: ResolvedSeerRun) -> bool:
"""A run that may be read or continued without explorer access.

Explorer chats are not included, so a saved run_id stops working once open
membership is turned off.
"""
return SeerAgentRun.objects.filter(
run__organization_id=organization.id,
run__seer_run_state_id=resolved.seer_run_state_id,
source=_DASHBOARD_GENERATE_RUN_SOURCE,
).exists()


@cell_silo_endpoint
class OrganizationSeerAgentChatEndpoint(OrganizationEndpoint):
publish_status = {
Expand Down Expand Up @@ -230,16 +246,21 @@ def get(

has_seer_access, _ = has_seer_access_with_detail(organization)

if not has_access and not has_seer_access:
raise PermissionDenied(error)

if not run_id:
if not has_access:
raise PermissionDenied(error)
return Response({"session": None}, status=404)

if not has_access and not has_seer_access:
raise PermissionDenied(error)

resolved = resolve_seer_run(run_id, organization)
if isinstance(resolved, Response):
return resolved

if not has_access and not _is_dashboard_generate_run(organization, resolved):
raise PermissionDenied(error)

try:
client = SeerAgentClient(organization, request.user)
state = client.get_run(run_id=resolved.seer_run_state_id)
Expand Down Expand Up @@ -279,10 +300,7 @@ def post(
has_access, error = has_seer_agent_access_with_detail(organization, request.user)

has_seer_access, _ = has_seer_access_with_detail(organization)
# Orgs with Seer access can continue existing dashboard generate runs, but cannot start new runs from this endpoint.
can_continue_dashboards_generate_run = has_seer_access and run_id is not None

if not has_access and not can_continue_dashboards_generate_run:
if not has_access and (run_id is None or not has_seer_access):
raise PermissionDenied(error)

serializer = SeerAgentChatSerializer(data=request.data)
Expand Down Expand Up @@ -339,6 +357,11 @@ def post(
return result
resolved = result

if not has_access and not (
resolved is not None and _is_dashboard_generate_run(organization, resolved)
):
raise PermissionDenied(error)

try:
enable_coding = organization.get_option(
"sentry:enable_seer_coding", False
Expand Down
138 changes: 135 additions & 3 deletions tests/sentry/seer/endpoints/test_organization_seer_agent_chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,11 @@ def test_post_continue_conversation_enable_coding(self, mock_client_class: Magic
def test_get_run_allowed_with_dashboards_ai_generate_flag(
self, mock_client_class: MagicMock
) -> None:
"""GET with run_id should succeed for orgs with Seer access even without seer-explorer."""
"""GET of a dashboard generation run succeeds without seer-explorer."""
run = self.create_seer_run(
organization=self.organization, seer_run_state_id=123, user_id=self.user.id
)
self.create_seer_agent_run(run=run, source="dashboard_generate")
mock_state = SeerRunState(
run_id=123,
blocks=[],
Expand All @@ -585,19 +589,36 @@ def test_get_run_allowed_with_dashboards_ai_generate_flag(
mock_client_class.return_value = mock_client

with self.feature({"organizations:seer-explorer": False}):
response = self.client.get(f"{self.url}123/")
response = self.client.get(f"{self.url}{run.seer_run_state_id}/")

assert response.status_code == 200
assert response.data["session"]["run_id"] == 123

@patch("sentry.seer.endpoints.organization_seer_agent_chat.SeerAgentClient")
def test_get_explorer_run_denied_without_seer_explorer_flag(
self, mock_client_class: MagicMock
) -> None:
"""A saved explorer run is not readable just because the org has Seer."""
run = self.create_seer_run(
organization=self.organization, seer_run_state_id=123, user_id=self.user.id
)
self.create_seer_agent_run(run=run, source="")

with self.feature({"organizations:seer-explorer": False}):
response = self.client.get(f"{self.url}{run.seer_run_state_id}/")

assert response.status_code == 403
mock_client_class.assert_not_called()

@patch("sentry.seer.endpoints.organization_seer_agent_chat.SeerAgentClient")
def test_continue_run_allowed_with_dashboards_ai_generate_flag(
self, mock_client_class: MagicMock
) -> None:
"""POST with run_id should succeed for orgs with Seer access even without seer-explorer."""
"""POST continues a dashboard generation run without seer-explorer."""
run = self.create_seer_run(
organization=self.organization, seer_run_state_id=789, user_id=self.user.id
)
self.create_seer_agent_run(run=run, source="dashboard_generate")
mock_client = MagicMock()
mock_client.continue_run.return_value = 789
mock_client_class.return_value = mock_client
Expand All @@ -609,6 +630,117 @@ def test_continue_run_allowed_with_dashboards_ai_generate_flag(
assert response.status_code == 200
assert response.data == {"run_id": 789, "sentry_run_id": str(run.uuid)}

@patch("sentry.seer.endpoints.organization_seer_agent_chat.SeerAgentClient")
def test_continue_explorer_run_denied_without_seer_explorer_flag(
self, mock_client_class: MagicMock
) -> None:
run = self.create_seer_run(
organization=self.organization, seer_run_state_id=789, user_id=self.user.id
)
self.create_seer_agent_run(run=run, source="")

with self.feature({"organizations:seer-explorer": False}):
response = self.client.post(
f"{self.url}{run.seer_run_state_id}/",
{"query": "Follow up question"},
format="json",
)

assert response.status_code == 403
mock_client_class.assert_not_called()

def _close_open_membership(self) -> None:
self.organization.flags.allow_joinleave = False
self.organization.save()

@patch("sentry.seer.endpoints.organization_seer_agent_chat.SeerAgentClient")
def test_get_denied_after_open_membership_disabled(self, mock_client_class: MagicMock) -> None:
run = self.create_seer_run(
organization=self.organization, seer_run_state_id=123, user_id=self.user.id
)
self.create_seer_agent_run(run=run, source="")
self._close_open_membership()

response = self.client.get(f"{self.url}{run.seer_run_state_id}/")

assert response.status_code == 403
assert "open team membership" in response.data["detail"]
mock_client_class.assert_not_called()

@patch("sentry.seer.endpoints.organization_seer_agent_chat.SeerAgentClient")
def test_continue_denied_after_open_membership_disabled(
self, mock_client_class: MagicMock
) -> None:
run = self.create_seer_run(
organization=self.organization, seer_run_state_id=789, user_id=self.user.id
)
self.create_seer_agent_run(run=run, source="")
self._close_open_membership()

response = self.client.post(
f"{self.url}{run.seer_run_state_id}/",
{"query": "what is inside the private project"},
format="json",
)

assert response.status_code == 403
assert "open team membership" in response.data["detail"]
mock_client_class.assert_not_called()

def test_new_run_denied_after_open_membership_disabled(self) -> None:
self._close_open_membership()

response = self.client.post(self.url, {"query": "Start a new conversation"}, format="json")

assert response.status_code == 403
assert "open team membership" in response.data["detail"]

@patch("sentry.seer.endpoints.organization_seer_agent_chat.SeerAgentClient")
def test_dashboard_run_still_readable_after_open_membership_disabled(
self, mock_client_class: MagicMock
) -> None:
run = self.create_seer_run(
organization=self.organization, seer_run_state_id=456, user_id=self.user.id
)
self.create_seer_agent_run(run=run, source="dashboard_generate")
self._close_open_membership()
mock_state = SeerRunState(
run_id=456,
blocks=[],
status="completed",
updated_at="2024-01-01T00:00:00Z",
)
mock_client = MagicMock()
mock_client.get_run.return_value = mock_state
mock_client_class.return_value = mock_client

response = self.client.get(f"{self.url}{run.seer_run_state_id}/")

assert response.status_code == 200
assert response.data["session"]["run_id"] == 456

@patch("sentry.seer.endpoints.organization_seer_agent_chat.SeerAgentClient")
def test_dashboard_run_still_continuable_after_open_membership_disabled(
self, mock_client_class: MagicMock
) -> None:
run = self.create_seer_run(
organization=self.organization, seer_run_state_id=456, user_id=self.user.id
)
self.create_seer_agent_run(run=run, source="dashboard_generate")
self._close_open_membership()
mock_client = MagicMock()
mock_client.continue_run.return_value = 456
mock_client_class.return_value = mock_client

response = self.client.post(
f"{self.url}{run.seer_run_state_id}/",
{"query": "Add an error rate widget"},
format="json",
)

assert response.status_code == 200
assert response.data == {"run_id": 456, "sentry_run_id": str(run.uuid)}

def test_new_run_denied_without_seer_explorer_flag(self) -> None:
"""POST without run_id should be denied for orgs without seer-explorer, even with Seer access."""
data = {"query": "Start a new conversation"}
Expand Down
Loading