Rename the organization model, experimental

Author: AlanCoding

ansible_ai_connect/ai/api/telemetry/tests/test_api_telemetry_settings_views.py

@@ -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
 
 
@@ -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:
@@ -85,7 +85,7 @@ 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)[
+        self.user.organization = ExternalOrganization.objects.get_or_create(id=123, telemetry_opt_out=True)[
             0
         ]
         self.client.force_authenticate(user=self.user)
@@ -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"))
@@ -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()):
@@ -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:
@@ -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)

ansible_ai_connect/ai/api/tests/test_chat_view.py

@@ -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,
@@ -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
 
@@ -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(
@@ -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(
@@ -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(
@@ -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(
@@ -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
@@ -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(
@@ -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
@@ -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
 
@@ -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(
@@ -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(
@@ -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(
@@ -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(
@@ -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
@@ -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