Skip to content

LLM-Driven Extraction of Unstructured Data — Built for API Deployments & ETL Pipeline Workflows

UN-3057 [FIX] Repair Prompt Studio projects left ownerless by the clone path (#2239)

Praveen Kumar3713a27815f9
diff --git a/backend/prompt_studio/prompt_studio_core_v2/migrations/0011_repair_ownerless_custom_tools.py b/backend/prompt_studio/prompt_studio_core_v2/migrations/0011_repair_ownerless_custom_tools.py
new file mode 100644
index 000000000..1053d93b6
--- /dev/null
+++ b/backend/prompt_studio/prompt_studio_core_v2/migrations/0011_repair_ownerless_custom_tools.py
@@ -0,0 +1,32 @@
+"""Grant ``created_by`` an OWNER row on custom tools that have no owner.
+
+Only resources with zero OWNER rows are touched, so it is safe to re-run and
+reverses to a no-op. Owner rows that name a platform key's service account
+are then re-pointed to the key's creator.
+"""
+
+from django.db import migrations
+from tenant_account_v2.migrations._membership_backfill import (
+ repair_ownerless_owner_rows,
+ repair_platform_key_ownership,
+)
+
+APP_LABEL = "prompt_studio_core_v2"
+MODEL_NAME = "CustomTool"
+
+
+def _forward(apps, schema_editor):
+ repair_ownerless_owner_rows(apps, APP_LABEL, MODEL_NAME)
+ repair_platform_key_ownership(apps)
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ("prompt_studio_core_v2", "0010_customtool_custtool_org_modified_idx"),
+ ("tenant_account_v2", "0005_resource_membership"),
+ ("platform_api", "0004_alter_platformapikey_organization"),
+ ]
+
+ operations = [
+ migrations.RunPython(_forward, migrations.RunPython.noop),
+ ]
diff --git a/backend/prompt_studio/prompt_studio_core_v2/tests/test_ownerless_owner_repair.py b/backend/prompt_studio/prompt_studio_core_v2/tests/test_ownerless_owner_repair.py
new file mode 100644
index 000000000..9c043c5db
--- /dev/null
+++ b/backend/prompt_studio/prompt_studio_core_v2/tests/test_ownerless_owner_repair.py
@@ -0,0 +1,86 @@
+"""Repair of ``CustomTool`` rows that have no OWNER membership."""
+
+from __future__ import annotations
+
+import secrets
+
+from account_v2.models import Organization, User
+from django.apps import apps as django_apps
+from django.test import TestCase
+from permissions.roles import ResourceRole
+from tenant_account_v2.migrations._membership_backfill import (
+ repair_ownerless_owner_rows,
+)
+
+from prompt_studio.prompt_studio_core_v2.models import CustomTool
+
+APP_LABEL = "prompt_studio_core_v2"
+MODEL_NAME = "CustomTool"
+
+
+def _make_user(email: str) -> User:
+ return User.objects.create_user(
+ username=email, email=email, password=secrets.token_urlsafe()
+ )
+
+
+class RepairOwnerlessOwnerRowsTests(TestCase):
+ def setUp(self) -> None:
+ self.org = Organization.objects.create(
+ name="org-a", display_name="Org A", organization_id="org-a"
+ )
+ self.creator = _make_user("[email protected]")
+ self.other = _make_user("[email protected]")
+
+ def _tool(self, name: str, creator: User | None) -> CustomTool:
+ return CustomTool.objects.create(
+ tool_name=name,
+ description="",
+ organization=self.org,
+ created_by=creator,
+ )
+
+ def _repair(self) -> int:
+ return repair_ownerless_owner_rows(django_apps, APP_LABEL, MODEL_NAME)
+
+ def _owner_ids(self, tool: CustomTool) -> set:
+ return set(
+ tool.memberships.filter(role=ResourceRole.OWNER).values_list(
+ "user_id", flat=True
+ )
+ )
+
+ def test_ownerless_tool_gets_an_owner_row_for_its_creator(self) -> None:
+ tool = self._tool("cloned-project", self.creator)
+ self.assertEqual(self._owner_ids(tool), set())
+
+ self._repair()
+
+ self.assertEqual(self._owner_ids(tool), {self.creator.id})
+
+ def test_creator_with_an_existing_viewer_row_is_promoted_to_owner(self) -> None:
+ """Membership is unique per (user, resource): the VIEWER row must be upgraded."""
+ tool = self._tool("viewer-creator-project", self.creator)
+ tool.memberships.create(user=self.creator, role=ResourceRole.VIEWER)
+
+ repaired = self._repair()
+
+ self.assertEqual(repaired, 1)
+ self.assertEqual(self._owner_ids(tool), {self.creator.id})
+ self.assertEqual(tool.memberships.filter(user=self.creator).count(), 1)
+
+ def test_tool_that_already_has_an_owner_is_left_alone(self) -> None:
+ """A creator deliberately replaced by a co-owner must not be re-added."""
+ tool = self._tool("handed-over-project", self.creator)
+ tool.memberships.create(user=self.other, role=ResourceRole.OWNER)
+
+ self._repair()
+
+ self.assertEqual(self._owner_ids(tool), {self.other.id})
+
+ def test_tool_with_no_creator_is_skipped(self) -> None:
+ tool = self._tool("orphan-project", None)
+
+ self._repair()
+
+ self.assertEqual(self._owner_ids(tool), set())
diff --git a/backend/tenant_account_v2/migrations/_membership_backfill.py b/backend/tenant_account_v2/migrations/_membership_backfill.py
index b9368db90..2dd55a959 100644
--- a/backend/tenant_account_v2/migrations/_membership_backfill.py
+++ b/backend/tenant_account_v2/migrations/_membership_backfill.py
@@ -72,6 +72,59 @@ def backfill_memberships(apps, app_label: str, model_name: str) -> None:
)
+def repair_ownerless_owner_rows(apps, app_label: str, model_name: str) -> int:
+ """Give ``created_by`` an OWNER row on resources that have no owner at all.
+
+ Only resources with *zero* OWNER rows are touched, so a creator who was
+ deliberately replaced by a co-owner is not resurrected. Null creator or
+ null organization means there is nothing to grant, so those are skipped.
+ Idempotent: a second run finds no ownerless rows.
+ """
+ Resource = apps.get_model(app_label, model_name) # NOSONAR
+ Membership = apps.get_model("tenant_account_v2", "ResourceMembership") # NOSONAR
+ ContentType = apps.get_model("contenttypes", "ContentType") # NOSONAR
+
+ content_type = ContentType.objects.get_for_model(Resource)
+ owned_ids = set(
+ Membership.objects.filter(content_type=content_type, role=OWNER).values_list(
+ "object_id", flat=True
+ )
+ )
+
+ # Base manager: unscoped with both live and historical models.
+ repaired = promoted = skipped = 0
+ for resource in Resource._base_manager.exclude(created_by=None).iterator():
+ if resource.organization_id is None:
+ skipped += 1
+ continue
+ object_id = str(resource.pk)
+ if object_id in owned_ids:
+ continue
+ # ``update_or_create``, not ``get_or_create``: membership is unique per
+ # (user, resource), so a creator already holding a VIEWER row would be
+ # returned unchanged and stay locked out. Promoting is safe because only
+ # resources with zero OWNER rows reach this point.
+ _, created = Membership.objects.update_or_create(
+ content_type=content_type,
+ object_id=object_id,
+ user_id=resource.created_by_id,
+ defaults={"role": OWNER, "organization_id": resource.organization_id},
+ )
+ repaired += 1
+ promoted += int(not created)
+
+ logger.info(
+ "%s.%s ownerless repair: owners granted=%s (%s promoted from an existing "
+ "row; skipped %s null-org)",
+ app_label,
+ model_name,
+ repaired,
+ promoted,
+ skipped,
+ )
+ return repaired
+
+
def repair_platform_key_ownership(apps) -> None:
"""Re-point service-account OWNER rows to the key's live creator.