Skip to content

Rename the organization model, delete unused team relations #1770

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

Draft
wants to merge 12 commits into
base: main
Choose a base branch
from
Draft

Rename the organization model, delete unused team relations #1770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ee150ff
Rename the organization model, experimental
AlanCoding Sep 22, 2025
79715e4
Fix other case
AlanCoding Sep 22, 2025
5e67873
Remove team relationshisp and add new AAP organization
AlanCoding Sep 22, 2025
2ddf2ee
Remove loading of RBAC application and prevent the JWT consumer from …
john-westcott-iv Sep 22, 2025
fd7d793
Revert migration changes, reforat migration stages
AlanCoding Sep 23, 2025
5c16bae
Clear RBAC data in intermediate step
AlanCoding Sep 23, 2025
88cb4bb
Set names back to intended
AlanCoding Sep 23, 2025
d09ee89
Run linters
AlanCoding Sep 24, 2025
075cb55
Revert DAB req back to main
AlanCoding Sep 24, 2025
8cd1169
Abandon the new organization model because we can do without it
AlanCoding Sep 25, 2025
3e1e817
Revert unintended pages
AlanCoding Sep 25, 2025
f6ebce5
Abandon data migration that will not work
AlanCoding Sep 25, 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
18 changes: 9 additions & 9 deletions ansible_ai_connect/ai/api/telemetry/tests/test_api_telemetry_settings_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
IsOrganisationLightspeedSubscriber,
)
from ansible_ai_connect.ai.api.tests.test_views import WisdomServiceAPITestCaseBase
from ansible_ai_connect.organizations.models import Organization
from ansible_ai_connect.organizations.models import ExternalOrganization
from ansible_ai_connect.test_utils import APIVersionTestCaseBase


Expand Down Expand Up @@ -71,7 +71,7 @@ def test_get_settings_without_org_id(self, *args):
@patch.object(feature_flags, "LDClient")
def test_get_settings_when_undefined(self, LDClient, *args):
LDClient.return_value.variation.return_value = True
self.user.organization = Organization.objects.get_or_create(id=123)[0]
self.user.organization = ExternalOrganization.objects.get_or_create(id=123)[0]
self.client.force_authenticate(user=self.user)

with self.assertLogs(logger="root", level="DEBUG") as log:
Expand All @@ -85,9 +85,9 @@ def test_get_settings_when_undefined(self, LDClient, *args):
@patch.object(feature_flags, "LDClient")
def test_get_settings_when_defined(self, LDClient, *args):
LDClient.return_value.variation.return_value = True
self.user.organization = Organization.objects.get_or_create(id=123, telemetry_opt_out=True)[
0
]
self.user.organization = ExternalOrganization.objects.get_or_create(
id=123, telemetry_opt_out=True
)[0]
self.client.force_authenticate(user=self.user)

with self.assertLogs(logger="root", level="DEBUG") as log:
Expand Down Expand Up @@ -115,7 +115,7 @@ def test_set_settings_without_org_id(self, *args):
@patch.object(feature_flags, "LDClient")
def test_set_settings_with_valid_value(self, LDClient, *args):
LDClient.return_value.variation.return_value = True
self.user.organization = Organization.objects.get_or_create(id=123)[0]
self.user.organization = ExternalOrganization.objects.get_or_create(id=123)[0]
self.client.force_authenticate(user=self.user)
# Settings should initially be False
r = self.client.get(self.api_version_reverse("telemetry_settings"))
Expand Down Expand Up @@ -150,7 +150,7 @@ def test_set_settings_with_valid_value(self, LDClient, *args):
@patch.object(feature_flags, "LDClient")
def test_set_settings_throws_exception(self, LDClient, *args):
LDClient.return_value.variation.return_value = True
self.user.organization = Organization.objects.get_or_create(id=123)[0]
self.user.organization = ExternalOrganization.objects.get_or_create(id=123)[0]
self.client.force_authenticate(user=self.user)

with patch("django.db.models.base.Model.save", side_effect=DatabaseError()):
Expand All @@ -168,7 +168,7 @@ def test_set_settings_throws_exception(self, LDClient, *args):
@patch.object(feature_flags, "LDClient")
def test_set_settings_throws_validation_exception(self, LDClient, *args):
LDClient.return_value.variation.return_value = True
self.user.organization = Organization.objects.get_or_create(id=123)[0]
self.user.organization = ExternalOrganization.objects.get_or_create(id=123)[0]
self.client.force_authenticate(user=self.user)

with self.assertLogs(logger="root", level="DEBUG") as log:
Expand All @@ -187,7 +187,7 @@ class TestTelemetrySettingsViewAsNonSubscriber(
APIVersionTestCaseBase, WisdomServiceAPITestCaseBase
):
def test_get_settings_as_non_subscriber(self, *args):
self.user.organization = Organization.objects.get_or_create(id=123)[0]
self.user.organization = ExternalOrganization.objects.get_or_create(id=123)[0]
self.client.force_authenticate(user=self.user)
r = self.client.get(self.api_version_reverse("telemetry_settings"))
self.assertEqual(r.status_code, HTTPStatus.FORBIDDEN)
32 changes: 16 additions & 16 deletions ansible_ai_connect/ai/api/tests/test_chat_view.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
)
from ansible_ai_connect.ai.api.model_pipelines.tests import mock_pipeline_config
from ansible_ai_connect.main import ssl_manager
from ansible_ai_connect.organizations.models import Organization
from ansible_ai_connect.organizations.models import ExternalOrganization
from ansible_ai_connect.test_utils import (
APIVersionTestCaseBase,
WisdomServiceAPITestCaseBase,
Expand Down Expand Up @@ -114,7 +114,7 @@ class TestChatView(APIVersionTestCaseBase, WisdomServiceAPITestCaseBase):

def setUp(self):
super().setUp()
(org, _) = Organization.objects.get_or_create(id=123, telemetry_opt_out=False)
(org, _) = ExternalOrganization.objects.get_or_create(id=123, telemetry_opt_out=False)
self.user.organization = org
self.user.rh_internal = True

Expand Down Expand Up @@ -307,7 +307,7 @@ def test_chat_with_system_prompt_override(self):
@override_settings(SEGMENT_WRITE_KEY="DUMMY_KEY_VALUE")
def test_operational_telemetry(self):
self.user.rh_user_has_seat = True
self.user.organization = Organization.objects.get_or_create(id=1)[0]
self.user.organization = ExternalOrganization.objects.get_or_create(id=1)[0]
self.client.force_authenticate(user=self.user)
with (
patch.object(
Expand Down Expand Up @@ -390,7 +390,7 @@ def test_operational_telemetry_limit_exceeded(self):
@override_settings(SEGMENT_WRITE_KEY="DUMMY_KEY_VALUE")
def test_operational_telemetry_anonymizer(self):
self.user.rh_user_has_seat = True
self.user.organization = Organization.objects.get_or_create(id=1)[0]
self.user.organization = ExternalOrganization.objects.get_or_create(id=1)[0]
self.client.force_authenticate(user=self.user)
with (
patch.object(
Expand All @@ -414,7 +414,7 @@ def test_operational_telemetry_anonymizer(self):
@override_settings(SEGMENT_WRITE_KEY="DUMMY_KEY_VALUE")
def test_operational_telemetry_with_system_prompt_override(self):
self.user.rh_user_has_seat = True
self.user.organization = Organization.objects.get_or_create(id=1)[0]
self.user.organization = ExternalOrganization.objects.get_or_create(id=1)[0]
self.client.force_authenticate(user=self.user)
with (
patch.object(
Expand Down Expand Up @@ -450,7 +450,7 @@ def test_operational_telemetry_with_system_prompt_override(self):
@override_settings(SEGMENT_WRITE_KEY="DUMMY_KEY_VALUE")
def test_operational_telemetry_with_no_tools_option(self):
self.user.rh_user_has_seat = True
self.user.organization = Organization.objects.get_or_create(id=1)[0]
self.user.organization = ExternalOrganization.objects.get_or_create(id=1)[0]
self.client.force_authenticate(user=self.user)
with (
patch.object(
Expand Down Expand Up @@ -491,7 +491,7 @@ def test_chat_rate_limit(self):
email=email,
password=password,
)
(org, _) = Organization.objects.get_or_create(id=123, telemetry_opt_out=False)
(org, _) = ExternalOrganization.objects.get_or_create(id=123, telemetry_opt_out=False)
self.user2.organization = org
self.user2.rh_internal = True
# Call chart API five times using self.user2
Expand All @@ -507,7 +507,7 @@ def test_chat_rate_limit(self):
def test_operational_telemetry_excludes_chat_prompt_by_default(self):
"""Test that chat_prompt is excluded from telemetry by default (via allow list)"""
self.user.rh_user_has_seat = True
self.user.organization = Organization.objects.get_or_create(id=1)[0]
self.user.organization = ExternalOrganization.objects.get_or_create(id=1)[0]
self.client.force_authenticate(user=self.user)
with (
patch.object(
Expand Down Expand Up @@ -538,7 +538,7 @@ def test_not_rh_internal_user(self):
self.user2 = get_user_model().objects.create_user(
username=username,
)
self.user2.organization = Organization.objects.get_or_create(
self.user2.organization = ExternalOrganization.objects.get_or_create(
id=123, telemetry_opt_out=False
)[0]
self.user2.rh_internal = False
Expand All @@ -553,7 +553,7 @@ class TestStreamingChatView(APIVersionTestCaseBase, WisdomServiceAPITestCaseBase

def setUp(self):
super().setUp()
(org, _) = Organization.objects.get_or_create(id=123, telemetry_opt_out=False)
(org, _) = ExternalOrganization.objects.get_or_create(id=123, telemetry_opt_out=False)
self.user.organization = org
self.user.rh_internal = True

Expand Down Expand Up @@ -663,7 +663,7 @@ def test_chat_internal_server_exception(self):
@override_settings(SEGMENT_WRITE_KEY="DUMMY_KEY_VALUE")
def test_operational_telemetry(self):
self.user.rh_user_has_seat = True
self.user.organization = Organization.objects.get_or_create(id=1)[0]
self.user.organization = ExternalOrganization.objects.get_or_create(id=1)[0]
self.client.force_authenticate(user=self.user)
with (
patch.object(
Expand Down Expand Up @@ -723,7 +723,7 @@ def test_operational_telemetry_limit_exceeded(self):
@override_settings(SEGMENT_WRITE_KEY="DUMMY_KEY_VALUE")
def test_operational_telemetry_anonymizer(self):
self.user.rh_user_has_seat = True
self.user.organization = Organization.objects.get_or_create(id=1)[0]
self.user.organization = ExternalOrganization.objects.get_or_create(id=1)[0]
self.client.force_authenticate(user=self.user)
with (
patch.object(
Expand All @@ -747,7 +747,7 @@ def test_operational_telemetry_anonymizer(self):
@override_settings(SEGMENT_WRITE_KEY="DUMMY_KEY_VALUE")
def test_operational_telemetry_with_system_prompt_override(self):
self.user.rh_user_has_seat = True
self.user.organization = Organization.objects.get_or_create(id=1)[0]
self.user.organization = ExternalOrganization.objects.get_or_create(id=1)[0]
self.client.force_authenticate(user=self.user)
with (
patch.object(
Expand Down Expand Up @@ -781,7 +781,7 @@ def test_operational_telemetry_with_system_prompt_override(self):
@override_settings(SEGMENT_WRITE_KEY="DUMMY_KEY_VALUE")
def test_operational_telemetry_with_no_tools_option(self):
self.user.rh_user_has_seat = True
self.user.organization = Organization.objects.get_or_create(id=1)[0]
self.user.organization = ExternalOrganization.objects.get_or_create(id=1)[0]
self.client.force_authenticate(user=self.user)
with (
patch.object(
Expand Down Expand Up @@ -821,7 +821,7 @@ def test_chat_rate_limit(self):
email=email,
password=password,
)
(org, _) = Organization.objects.get_or_create(id=123, telemetry_opt_out=False)
(org, _) = ExternalOrganization.objects.get_or_create(id=123, telemetry_opt_out=False)
self.user2.organization = org
self.user2.rh_internal = True
# Call chart API five times using self.user2
Expand All @@ -839,7 +839,7 @@ def test_not_rh_internal_user(self):
self.user2 = get_user_model().objects.create_user(
username=username,
)
self.user2.organization = Organization.objects.get_or_create(
self.user2.organization = ExternalOrganization.objects.get_or_create(
id=123, telemetry_opt_out=False
)[0]
self.user2.rh_internal = False
Expand Down
Loading
Loading