Skip to content

Open-source AI teammates in Slack, Teams, Discord, Telegram and Mattermost. Self-host it, with any agent harness and any model.

Resources: a reference or document in a package can be deleted

Simon Flack46a6cb519082
diff --git a/core/switch_core/db/stores/document_store.py b/core/switch_core/db/stores/document_store.py
index b0b8a1a37..1358ae80e 100644
--- a/core/switch_core/db/stores/document_store.py
+++ b/core/switch_core/db/stores/document_store.py
@@ -1,7 +1,7 @@
from sqlalchemy import and_, delete, func, insert, or_, select
from sqlalchemy.ext.asyncio import AsyncSession
-from switch_core.db.models import Document, Room, room_documents
+from switch_core.db.models import Document, Room, package_documents, room_documents
from switch_core.db.stores.room_store import AttachedRooms, readable_by
@@ -82,6 +82,16 @@ class DocumentStore:
return doc
async def delete(self, session: AsyncSession, document_id: str) -> list[str]:
+ """Delete a document, taking it out of every room and package it is
+ in. Returns the list of room_ids it was attached to.
+
+ Package membership has no cascade, so it is removed here: without it a
+ packaged document cannot be deleted at all."""
+ await session.execute(
+ delete(package_documents).where(
+ package_documents.c.document_id == document_id
+ )
+ )
room_id_result = await session.execute(
select(room_documents.c.room_id).where(
room_documents.c.document_id == document_id
diff --git a/core/switch_core/db/stores/reference_store.py b/core/switch_core/db/stores/reference_store.py
index 60741b39a..4f458d33b 100644
--- a/core/switch_core/db/stores/reference_store.py
+++ b/core/switch_core/db/stores/reference_store.py
@@ -2,7 +2,13 @@ from sqlalchemy import delete, func, or_, select
from sqlalchemy.dialects.postgresql import insert as pg_insert
from sqlalchemy.ext.asyncio import AsyncSession
-from switch_core.db.models import Reference, Room, User, room_references
+from switch_core.db.models import (
+ Reference,
+ Room,
+ User,
+ package_references,
+ room_references,
+)
from switch_core.db.stores.room_store import AttachedRooms, readable_by
_LIKE_ESCAPE = "\\"
@@ -122,7 +128,16 @@ class ReferenceStore:
return ref
async def delete(self, session: AsyncSession, reference_id: str) -> list[str]:
- """Delete a reference. Returns the list of room_ids it was attached to."""
+ """Delete a reference, taking it out of every room and package it is
+ in. Returns the list of room_ids it was attached to.
+
+ Package membership has no cascade, so it is removed here: without it a
+ packaged reference cannot be deleted at all."""
+ await session.execute(
+ delete(package_references).where(
+ package_references.c.reference_id == reference_id
+ )
+ )
room_id_result = await session.execute(
select(room_references.c.room_id).where(
room_references.c.reference_id == reference_id
diff --git a/core/tests/switch_core/bridges/resource/test_delete_packaged_resource.py b/core/tests/switch_core/bridges/resource/test_delete_packaged_resource.py
new file mode 100644
index 000000000..671d86f4e
--- /dev/null
+++ b/core/tests/switch_core/bridges/resource/test_delete_packaged_resource.py
@@ -0,0 +1,113 @@
+"""A reference or document that sits in a package can still be deleted.
+
+Package membership has no cascade on the member's side, so deleting a
+packaged reference or document used to fail with a foreign key violation
+(a 500 from the gateway). Deleting now takes it out of its packages too,
+and the package lives on without it.
+"""
+
+from __future__ import annotations
+
+from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
+
+from switch_core.bridges.resource.service import ResourceService
+from switch_core.db.models import User
+from switch_core.db.stores.document_store import DocumentStore
+from switch_core.db.stores.package_store import PackageStore
+from switch_core.db.stores.reference_store import ReferenceStore
+from switch_core.db.stores.reference_type_store import ReferenceTypeStore
+from switch_core.db.stores.room_link_store import RoomLinkStore
+
+
+def _svc(session_factory: async_sessionmaker[AsyncSession]) -> ResourceService:
+ return ResourceService(
+ reference_store=ReferenceStore(),
+ reference_type_store=ReferenceTypeStore(),
+ document_store=DocumentStore(),
+ package_store=PackageStore(),
+ room_link_store=RoomLinkStore(),
+ session_factory=session_factory,
+ )
+
+
+async def _owner(session: AsyncSession) -> User:
+ user = User(name="owner", email="[email protected]", role="user")
+ session.add(user)
+ await session.flush()
+ return user
+
+
+async def test_a_packaged_reference_is_deleted_and_leaves_its_package(
+ session_factory: async_sessionmaker[AsyncSession],
+) -> None:
+ svc = _svc(session_factory)
+ async with session_factory() as session:
+ owner = await _owner(session)
+ ref = await svc.create_reference(
+ session,
+ owner_id=owner.id,
+ is_admin=False,
+ read_visibility="public",
+ write_visibility="private",
+ type="github",
+ name="repo",
+ description="",
+ instructions="",
+ value={"urls": ["https://github.com/example/repo"]},
+ )
+ pkg = await svc.create_package(
+ session,
+ owner_id=owner.id,
+ read_visibility="public",
+ write_visibility="private",
+ name="kit",
+ description="",
+ instructions="",
+ )
+ await svc.add_reference_to_package(
+ session, pkg.id, ref.id, user_id=owner.id, is_admin=False
+ )
+ await session.commit()
+
+ assert await svc.list_packages_for_reference(session, ref.id) == [pkg.id]
+ await svc.delete_reference(session, ref.id, user_id=owner.id, is_admin=False)
+ await session.commit()
+
+ assert await svc.list_package_references(session, pkg.id) == []
+ assert await svc.get_package_for_user(session, pkg.id, owner.id, is_admin=False)
+
+
+async def test_a_packaged_document_is_deleted_and_leaves_its_package(
+ session_factory: async_sessionmaker[AsyncSession],
+) -> None:
+ svc = _svc(session_factory)
+ async with session_factory() as session:
+ owner = await _owner(session)
+ doc = await svc.create_document(
+ session,
+ owner_id=owner.id,
+ read_visibility="public",
+ write_visibility="private",
+ name="guide",
+ description="",
+ instructions="",
+ content="# Guide",
+ )
+ pkg = await svc.create_package(
+ session,
+ owner_id=owner.id,
+ read_visibility="public",
+ write_visibility="private",
+ name="kit",
+ description="",
+ instructions="",
+ )
+ await svc.add_document_to_package(
+ session, pkg.id, doc.id, user_id=owner.id, is_admin=False
+ )
+ await session.commit()
+
+ await svc.delete_document(session, doc.id, user_id=owner.id, is_admin=False)
+ await session.commit()
+
+ assert await svc.list_package_documents(session, pkg.id) == []