Skip to content

fix: enforce audience-scoped actor recall #17

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

Merged
dajiaohuang merged 1 commit into from
Aug 29, 2026
Merged

fix: enforce audience-scoped actor recall #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
176 changes: 113 additions & 63 deletions src/sagasmith_core/events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,15 +282,18 @@ def list_for_actor(
*,
actor_id: str,
roles: set[str] | frozenset[str] | None = None,
knowledge_disclosure_scopes: set[str] | frozenset[str] | None = None,
audience: str | None = None,
limit: int = 50,
branch_id: str | None = None,
) -> list[CampaignEventInfo]:
"""List visible branch events explicitly indexed to one actor."""

selected_roles = set(roles or EVENT_PARTICIPANT_ROLES)
unknown_roles = selected_roles - EVENT_PARTICIPANT_ROLES
if unknown_roles:
raise ValueError(f"invalid event participant roles: {sorted(unknown_roles)}")
selected_roles, selected_disclosure_scopes = self._actor_filters(
roles=roles,
knowledge_disclosure_scopes=knowledge_disclosure_scopes,
audience=audience,
)
with self.database.transaction() as session:
campaign = session.get(Campaign, campaign_id)
if campaign is None:
Expand All @@ -299,19 +302,20 @@ def list_for_actor(
if actor is None or actor.campaign_id != campaign_id:
raise LookupError(actor_id)
branch = resolve_branch(session, campaign, branch_id)
participant_event_ids = set(
session.scalars(
select(CampaignEventParticipant.event_id).where(
CampaignEventParticipant.actor_id == actor_id,
CampaignEventParticipant.role.in_(selected_roles),
)
)
actor_event_ids = self._actor_event_ids(
session,
branch_id=branch.id,
actor_id=actor_id,
roles=selected_roles,
knowledge_disclosure_scopes=selected_disclosure_scopes,
)
rows = [
row
for row in self._branch_rows(session, campaign_id, branch)
if row.id in participant_event_ids
][-max(1, min(limit, 500)) :]
if row.id in actor_event_ids
]
rows = self._actor_audience_rows(rows, audience=audience)
rows = rows[-max(1, min(limit, 500)) :]
participants = self._participant_map(session, [row.id for row in rows])
return [self._info(row, participants.get(row.id, [])) for row in rows]

Expand All @@ -323,6 +327,7 @@ def search_for_actor(
query: str,
roles: set[str] | frozenset[str] | None = None,
knowledge_disclosure_scopes: set[str] | frozenset[str] | None = None,
audience: str | None = None,
limit: int = 50,
branch_id: str | None = None,
) -> list[CampaignEventInfo]:
Expand All @@ -331,24 +336,11 @@ def search_for_actor(
normalized_query = str(query or "").strip()
if not normalized_query:
raise ValueError("event search query must not be blank")
selected_roles = set(roles or EVENT_PARTICIPANT_ROLES)
unknown_roles = selected_roles - EVENT_PARTICIPANT_ROLES
if unknown_roles:
raise ValueError(f"invalid event participant roles: {sorted(unknown_roles)}")
selected_disclosure_scopes = (
None
if knowledge_disclosure_scopes is None
else set(knowledge_disclosure_scopes)
selected_roles, selected_disclosure_scopes = self._actor_filters(
roles=roles,
knowledge_disclosure_scopes=knowledge_disclosure_scopes,
audience=audience,
)
if selected_disclosure_scopes is not None:
unknown_scopes = (
selected_disclosure_scopes - ACTOR_KNOWLEDGE_DISCLOSURE_SCOPES
)
if unknown_scopes:
raise ValueError(
"invalid actor-knowledge disclosure scopes: "
f"{sorted(unknown_scopes)}"
)
with self.database.transaction() as session:
campaign = session.get(Campaign, campaign_id)
if campaign is None:
Expand All @@ -357,45 +349,19 @@ def search_for_actor(
if actor is None or actor.campaign_id != campaign_id:
raise LookupError(actor_id)
branch = resolve_branch(session, campaign, branch_id)
participant_event_ids = set(
session.scalars(
select(CampaignEventParticipant.event_id).where(
CampaignEventParticipant.actor_id == actor_id,
CampaignEventParticipant.role.in_(selected_roles),
)
)
actor_event_ids = self._actor_event_ids(
session,
branch_id=branch.id,
actor_id=actor_id,
roles=selected_roles,
knowledge_disclosure_scopes=selected_disclosure_scopes,
)
knowledge_event_ids: set[str] = set()
if selected_disclosure_scopes:
knowledge_event_ids = {
str(source_event_id)
for source_event_id in session.scalars(
select(ActorKnowledgeRevision.source_event_id)
.join(
BranchActorKnowledgeHead,
BranchActorKnowledgeHead.revision_id
== ActorKnowledgeRevision.id,
)
.join(
ActorKnowledge,
ActorKnowledge.id == BranchActorKnowledgeHead.knowledge_id,
)
.where(
BranchActorKnowledgeHead.branch_id == branch.id,
ActorKnowledge.actor_id == actor_id,
ActorKnowledgeRevision.source_event_id.is_not(None),
ActorKnowledgeRevision.disclosure_scope.in_(
selected_disclosure_scopes
),
)
)
}
actor_event_ids = participant_event_ids | knowledge_event_ids
rows = [
row
for row in self._branch_rows(session, campaign_id, branch)
if row.id in actor_event_ids
]
rows = self._actor_audience_rows(rows, audience=audience)
scored = [
(
lexical_score(
Expand All @@ -418,6 +384,90 @@ def search_for_actor(
participants = self._participant_map(session, [row.id for row in ranked])
return [self._info(row, participants.get(row.id, [])) for row in ranked]

@staticmethod
def _actor_filters(
*,
roles: set[str] | frozenset[str] | None,
knowledge_disclosure_scopes: set[str] | frozenset[str] | None,
audience: str | None,
) -> tuple[set[str], set[str] | None]:
selected_roles = set(roles or EVENT_PARTICIPANT_ROLES)
unknown_roles = selected_roles - EVENT_PARTICIPANT_ROLES
if unknown_roles:
raise ValueError(f"invalid event participant roles: {sorted(unknown_roles)}")
selected_disclosure_scopes = (
None
if knowledge_disclosure_scopes is None
else set(knowledge_disclosure_scopes)
)
if selected_disclosure_scopes is not None:
unknown_scopes = selected_disclosure_scopes - ACTOR_KNOWLEDGE_DISCLOSURE_SCOPES
if unknown_scopes:
raise ValueError(
"invalid actor-knowledge disclosure scopes: "
f"{sorted(unknown_scopes)}"
)
if audience is not None and audience not in CONTINUITY_AUDIENCES:
raise ValueError("audience must be 'dm' or 'player'")
if audience == "player" and selected_disclosure_scopes is not None:
selected_disclosure_scopes &= PLAYER_OWNED_ACTOR_DISCLOSURE_SCOPES
return selected_roles, selected_disclosure_scopes

@staticmethod
def _actor_event_ids(
session,
*,
branch_id: str,
actor_id: str,
roles: set[str],
knowledge_disclosure_scopes: set[str] | None,
) -> set[str]:
event_ids = set(
session.scalars(
select(CampaignEventParticipant.event_id).where(
CampaignEventParticipant.actor_id == actor_id,
CampaignEventParticipant.role.in_(roles),
)
)
)
if knowledge_disclosure_scopes:
event_ids.update(
str(source_event_id)
for source_event_id in session.scalars(
select(ActorKnowledgeRevision.source_event_id)
.join(
BranchActorKnowledgeHead,
BranchActorKnowledgeHead.revision_id == ActorKnowledgeRevision.id,
)
.join(
ActorKnowledge,
ActorKnowledge.id == BranchActorKnowledgeHead.knowledge_id,
)
.where(
BranchActorKnowledgeHead.branch_id == branch_id,
ActorKnowledge.actor_id == actor_id,
ActorKnowledgeRevision.source_event_id.is_not(None),
ActorKnowledgeRevision.disclosure_scope.in_(
knowledge_disclosure_scopes
),
)
)
)
return event_ids

@staticmethod
def _actor_audience_rows(
rows: list[CampaignEvent], *, audience: str | None
) -> list[CampaignEvent]:
if audience != "player":
return rows
return [
row
for row in rows
if row.audience_scope in PLAYER_EVENT_AUDIENCE_SCOPES
or row.audience_scope == "actor"
]

def list_for_audience(
self,
campaign_id: str,
Expand Down
21 changes: 21 additions & 0 deletions src/sagasmith_core/knowledge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,20 @@ def list(
actor_id: str,
branch_id: str | None = None,
include_inactive: bool = False,
disclosure_scopes: set[str] | frozenset[str] | None = None,
) -> list[ActorKnowledgeInfo]:
selected_disclosure_scopes = (
None if disclosure_scopes is None else set(disclosure_scopes)
)
if selected_disclosure_scopes is not None:
unknown_scopes = (
selected_disclosure_scopes - ACTOR_KNOWLEDGE_DISCLOSURE_SCOPES
)
if unknown_scopes:
raise ValueError(
"invalid actor-knowledge disclosure scopes: "
f"{sorted(unknown_scopes)}"
)
with self.database.transaction() as session:
campaign = session.get(Campaign, campaign_id)
if campaign is None:
Expand Down Expand Up @@ -314,6 +327,12 @@ def list(
INACTIVE_ACTOR_KNOWLEDGE_STATUSES
)
)
if selected_disclosure_scopes is not None:
statement = statement.where(
ActorKnowledgeRevision.disclosure_scope.in_(
selected_disclosure_scopes
)
)
rows = session.execute(statement)
return [self._info(*row) for row in rows]

Expand Down Expand Up @@ -346,12 +365,14 @@ def search(
branch_id: str | None = None,
limit: int = 8,
include_inactive: bool = False,
disclosure_scopes: set[str] | frozenset[str] | None = None,
) -> list[ActorKnowledgeInfo]:
values = self.list(
campaign_id,
actor_id=actor_id,
branch_id=branch_id,
include_inactive=include_inactive,
disclosure_scopes=disclosure_scopes,
)
ranked = sorted(
values,
Expand Down
Loading