apunkt/SurfSense
1
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-07-18 23:11:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix(chat): let search-space owners reference legacy null-creator chats

Browse source 
Mirror search_threads visibility in the referenced-chat resolver: a
search-space owner can now @-mention legacy threads that predate creator
tracking (null created_by_id), instead of those being silently dropped.
This commit is contained in:
CREDO23 2026-06-23 18:30:15 +02:00
parent 208ad9a643
commit 5d79f91352
1 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

48
surfsense_backend/app/agents/chat/runtime/referenced_chat_context/resolver.py
View file

@ -11,10 +11,16 @@ from __future__ import annotations
import logging import logging
from uuid import UUID from uuid import UUID
from sqlalchemy import select from sqlalchemy import or_, select
from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.ext.asyncio import AsyncSession
from app.db import ChatVisibility, NewChatMessage, NewChatMessageRole, NewChatThread from app.db import (
ChatVisibility,
NewChatMessage,
NewChatMessageRole,
NewChatThread,
SearchSpace,
)
from app.tasks.chat.llm_history_normalizer import ( from app.tasks.chat.llm_history_normalizer import (
assistant_content_to_llm_text, assistant_content_to_llm_text,
user_content_to_llm_content, user_content_to_llm_content,
@ -25,18 +31,20 @@ from .models import ReferencedChat, ReferencedChatTurn
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
def _accessible_thread_filter(user_uuid: UUID | None): def _accessible_thread_filter(user_uuid: UUID | None, *, include_legacy: bool):
"""Visibility predicate mirroring ``new_chat_routes.search_threads``. """Visibility predicate mirroring ``new_chat_routes.search_threads``.
A thread is referenceable when the requester created it or it is A thread is referenceable when the requester created it, it is shared
shared with the search space. Legacy null-creator threads are with the search space, or it is a legacy null-creator thread and the
excluded (fail-closed) — referencing them is a rare edge case not requester owns the search space (``include_legacy``). Anything else is
worth widening the surface for. dropped (fail-closed).
""" """
shared = NewChatThread.visibility == ChatVisibility.SEARCH_SPACE conditions = [NewChatThread.visibility == ChatVisibility.SEARCH_SPACE]
if user_uuid is None: if user_uuid is not None:
return shared conditions.append(NewChatThread.created_by_id == user_uuid)
return (NewChatThread.created_by_id == user_uuid) | shared if include_legacy:
conditions.append(NewChatThread.created_by_id.is_(None))
return or_(*conditions)
async def resolve_referenced_chats( async def resolve_referenced_chats(
@ -74,14 +82,30 @@ async def resolve_referenced_chats(
if not requested_ids: if not requested_ids:
return [] return []
# Legacy null-creator threads are referenceable only by the search-space
# owner, matching ``search_threads`` (the source the picker reads from).
include_legacy = False
if user_uuid is not None:
owner_id = await session.scalar(
select(SearchSpace.user_id).where(SearchSpace.id == search_space_id)
)
include_legacy = owner_id == user_uuid
thread_rows = await session.execute( thread_rows = await session.execute(
select(NewChatThread).where( select(NewChatThread).where(
NewChatThread.id.in_(requested_ids), NewChatThread.id.in_(requested_ids),
NewChatThread.search_space_id == search_space_id, NewChatThread.search_space_id == search_space_id,
_accessible_thread_filter(user_uuid), _accessible_thread_filter(user_uuid, include_legacy=include_legacy),
) )
) )
threads_by_id = {row.id: row for row in thread_rows.scalars().all()} threads_by_id = {row.id: row for row in thread_rows.scalars().all()}
logger.info(
"resolve_referenced_chats: requested=%s accessible=%s space=%s user=%s",
requested_ids,
sorted(threads_by_id.keys()),
search_space_id,
user_uuid,
)
if not threads_by_id: if not threads_by_id:
return [] return []