feat: 新增岗位管理、提示词模板与资源标签,完善用户提示词与推荐问题接口
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
2f414c6e08
commit
3855c30edd
52 files changed
+3143
-57
No files matched your search
+79
-12
@@ -18,6 +18,7 @@ post-compaction behavior).
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
import threading
|
||||
from collections import OrderedDict
|
||||
from collections.abc import Awaitable, Callable, Collection
|
||||
from dataclasses import dataclass
|
||||
@@ -131,6 +132,27 @@ class _SummaryCacheEntry:
|
||||
reusable: bool
|
||||
|
||||
|
||||
# Process-wide summary cache shared across every middleware instance.
|
||||
#
|
||||
# ``make_lead_agent`` rebuilds the agent — and therefore a *fresh*
|
||||
# ``DeerFlowSummarizationMiddleware`` — on every run. If the cache lived on the
|
||||
# instance (``self._summary_cache``) it would be empty at the start of each
|
||||
# user turn, forcing a brand-new (blocking) summarization LLM call on *every*
|
||||
# turn of a long conversation. Hoisting it to module scope, keyed by
|
||||
# ``thread_id``, lets a summary computed on one turn be reused on the next,
|
||||
# so only the first threshold crossing (or a genuine re-compaction) pays for an
|
||||
# LLM call. A lock guards the non-atomic LRU eviction against concurrent
|
||||
# threads (subagents / parallel conversations share this process).
|
||||
_GLOBAL_SUMMARY_CACHE: "OrderedDict[str, _SummaryCacheEntry]" = OrderedDict()
|
||||
_GLOBAL_SUMMARY_CACHE_LOCK = threading.Lock()
|
||||
|
||||
|
||||
def _clear_global_summary_cache() -> None:
|
||||
"""Drop every cached summary. Intended for tests/diagnostics only."""
|
||||
with _GLOBAL_SUMMARY_CACHE_LOCK:
|
||||
_GLOBAL_SUMMARY_CACHE.clear()
|
||||
|
||||
|
||||
class DeerFlowSummarizationMiddleware(SummarizationMiddleware):
|
||||
"""Summarization middleware with pre-compression hook dispatch and skill rescue."""
|
||||
|
||||
@@ -153,8 +175,9 @@ class DeerFlowSummarizationMiddleware(SummarizationMiddleware):
|
||||
self._preserve_recent_skill_tokens = max(0, preserve_recent_skill_tokens)
|
||||
self._preserve_recent_skill_tokens_per_skill = max(0, preserve_recent_skill_tokens_per_skill)
|
||||
# Per-thread cache of the most recent summary: thread_id -> (summarized message ids, summary text).
|
||||
# Lets us reuse a summary across model calls instead of re-running the LLM every invocation.
|
||||
self._summary_cache: OrderedDict[str, _SummaryCacheEntry] = OrderedDict()
|
||||
# Points at the *process-wide* cache (not a fresh per-instance dict) so a
|
||||
# summary survives across runs/turns — see ``_GLOBAL_SUMMARY_CACHE``.
|
||||
self._summary_cache: OrderedDict[str, _SummaryCacheEntry] = _GLOBAL_SUMMARY_CACHE
|
||||
|
||||
@override
|
||||
def before_model(self, state: AgentState, runtime: Runtime) -> dict | None:
|
||||
@@ -208,6 +231,7 @@ class DeerFlowSummarizationMiddleware(SummarizationMiddleware):
|
||||
return payload # type: ignore[return-value]
|
||||
# action == "summarize"
|
||||
messages_to_summarize, preserved, thread_id = payload # type: ignore[misc]
|
||||
self._emit_compacting_notice()
|
||||
self._fire_hooks(messages_to_summarize, preserved, getattr(request, "runtime", None))
|
||||
summary = self._create_summary(messages_to_summarize)
|
||||
return self._finish_summarize(messages_to_summarize, preserved, summary, thread_id)
|
||||
@@ -221,10 +245,34 @@ class DeerFlowSummarizationMiddleware(SummarizationMiddleware):
|
||||
if action == "reuse":
|
||||
return payload # type: ignore[return-value]
|
||||
messages_to_summarize, preserved, thread_id = payload # type: ignore[misc]
|
||||
self._emit_compacting_notice()
|
||||
self._fire_hooks(messages_to_summarize, preserved, getattr(request, "runtime", None))
|
||||
summary = await self._acreate_summary(messages_to_summarize)
|
||||
return self._finish_summarize(messages_to_summarize, preserved, summary, thread_id)
|
||||
|
||||
@staticmethod
|
||||
def _emit_compacting_notice() -> None:
|
||||
"""Best-effort UI hint that a (blocking) summarization LLM call is starting.
|
||||
|
||||
Only the genuine summarize path calls this — the cheap cache-reuse path
|
||||
does no LLM work and stays silent. Emitted on LangGraph's ``custom``
|
||||
stream channel; the chat frontend renders it as a transient toast. A
|
||||
no-op when there is no active stream writer (e.g. unit tests, non-stream
|
||||
runs), so callers never branch.
|
||||
"""
|
||||
try:
|
||||
from langgraph.config import get_stream_writer
|
||||
|
||||
writer = get_stream_writer()
|
||||
except Exception:
|
||||
return
|
||||
if writer is None:
|
||||
return
|
||||
try:
|
||||
writer({"type": "context_compacting", "message": "正在压缩上下文以容纳更长对话…"})
|
||||
except Exception:
|
||||
logger.debug("summarization: failed to emit context_compacting notice", exc_info=True)
|
||||
|
||||
def _plan_compression(
|
||||
self,
|
||||
request: ModelRequest,
|
||||
@@ -243,23 +291,30 @@ class DeerFlowSummarizationMiddleware(SummarizationMiddleware):
|
||||
if not messages:
|
||||
return None
|
||||
self._ensure_message_ids(messages)
|
||||
thread_id = self._resolve_request_thread_id(request)
|
||||
|
||||
cached = self._summary_cache.get(thread_id) if thread_id else None
|
||||
# Threshold is the first gate: while the *full* current conversation is
|
||||
# still under the configured trigger, there is nothing to compress —
|
||||
# pass it through untouched. No cache lookup, no summary substitution.
|
||||
# Compression only ever engages once the real context crosses the
|
||||
# trigger, which is exactly when it is needed.
|
||||
if not self._should_summarize(messages, self.token_counter(messages)):
|
||||
return None
|
||||
|
||||
thread_id = self._resolve_request_thread_id(request)
|
||||
if thread_id is None:
|
||||
logger.debug("summarization: thread_id unresolved; cross-turn summary cache disabled for this call")
|
||||
cached = self._get_cache_entry(thread_id) if thread_id else None
|
||||
present_ids = {m.id for m in messages}
|
||||
if cached is not None and cached.reusable and cached.summarized_ids <= present_ids:
|
||||
preserved = [m for m in messages if m.id not in cached.summarized_ids]
|
||||
effective = [self._summary_message(cached.summary_text), *preserved]
|
||||
if not self._should_summarize(effective, self.token_counter(effective)):
|
||||
# Refresh LRU recency and reuse without an LLM call.
|
||||
self._summary_cache.move_to_end(thread_id)
|
||||
self._touch_cache_entry(thread_id)
|
||||
return ("reuse", effective)
|
||||
# New messages have pushed the compressed context back over the
|
||||
# threshold — fall through and re-summarize a larger prefix.
|
||||
|
||||
if not self._should_summarize(messages, self.token_counter(messages)):
|
||||
return None
|
||||
|
||||
cutoff_index = self._determine_cutoff_index(messages)
|
||||
if cutoff_index <= 0:
|
||||
return None
|
||||
@@ -294,12 +349,24 @@ class DeerFlowSummarizationMiddleware(SummarizationMiddleware):
|
||||
|
||||
return compressed
|
||||
|
||||
def _get_cache_entry(self, thread_id: str) -> _SummaryCacheEntry | None:
|
||||
"""Return the cached entry for ``thread_id`` (thread-safe read)."""
|
||||
with _GLOBAL_SUMMARY_CACHE_LOCK:
|
||||
return self._summary_cache.get(thread_id)
|
||||
|
||||
def _touch_cache_entry(self, thread_id: str) -> None:
|
||||
"""Refresh LRU recency for ``thread_id`` if still present (thread-safe)."""
|
||||
with _GLOBAL_SUMMARY_CACHE_LOCK:
|
||||
if thread_id in self._summary_cache:
|
||||
self._summary_cache.move_to_end(thread_id)
|
||||
|
||||
def _store_cache_entry(self, thread_id: str, entry: _SummaryCacheEntry) -> None:
|
||||
"""Insert/refresh a cache entry, evicting the oldest thread if over capacity."""
|
||||
self._summary_cache[thread_id] = entry
|
||||
self._summary_cache.move_to_end(thread_id)
|
||||
while len(self._summary_cache) > _SUMMARY_CACHE_MAX_THREADS:
|
||||
self._summary_cache.popitem(last=False)
|
||||
with _GLOBAL_SUMMARY_CACHE_LOCK:
|
||||
self._summary_cache[thread_id] = entry
|
||||
self._summary_cache.move_to_end(thread_id)
|
||||
while len(self._summary_cache) > _SUMMARY_CACHE_MAX_THREADS:
|
||||
self._summary_cache.popitem(last=False)
|
||||
|
||||
@staticmethod
|
||||
def _resolve_request_thread_id(request: ModelRequest) -> str | None:
|
||||
|
||||
+8
-1
@@ -32,7 +32,7 @@ class AgentRow(Base):
|
||||
# ``is_private``. Empty string = "not assigned" → the listing layer treats
|
||||
# it as the admin-configured default square. Each agent belongs to at most
|
||||
# one square (single column), so it can never be published to two squares.
|
||||
square_id: Mapped[str] = mapped_column(String(64), nullable=False, default="", server_default="", index=True)
|
||||
square_id: Mapped[str] = mapped_column(String(64), nullable=False, default="", server_default="", index=True)
|
||||
# NULL = not featured on the homepage selector. Non-NULL = admin-curated
|
||||
# featured rank (lower sorts first). Only ``published=True`` agents are
|
||||
# eligible; the router enforces that invariant on writes. BIGINT so the
|
||||
@@ -57,6 +57,13 @@ class AgentFavoriteRow(Base):
|
||||
id: Mapped[str] = mapped_column(String(64), primary_key=True)
|
||||
user_id: Mapped[str] = mapped_column(String(64), nullable=False, index=True)
|
||||
agent_id: Mapped[str] = mapped_column(String(64), nullable=False, index=True)
|
||||
# Where this favorite came from: ``"user"`` = the user bookmarked it
|
||||
# themselves; ``"position"`` = it was auto-granted by the user's 岗位
|
||||
# (position) via the subscription sync engine. Sync only ever adds/removes
|
||||
# ``"position"`` rows, so a user's own bookmarks are never clobbered.
|
||||
origin: Mapped[str] = mapped_column(String(16), nullable=False, default="user", server_default="user")
|
||||
# The position that granted this favorite (only set when ``origin='position'``).
|
||||
position_id: Mapped[str | None] = mapped_column(String(64), nullable=True, index=True)
|
||||
created_at: Mapped[datetime] = mapped_column(BeijingDateTime(), nullable=False, default=lambda: datetime.now(UTC))
|
||||
|
||||
|
||||
|
||||
+108
@@ -0,0 +1,108 @@
|
||||
"""岗位 (position) subscription system.
|
||||
|
||||
New tables ``positions`` + ``position_tag_bindings``; new column
|
||||
``users.position_id``; ``origin`` / ``position_id`` on ``agent_favorites`` and
|
||||
``scheduled_task_subscriptions``; ``is_template`` / ``origin`` / ``template_id``
|
||||
/ ``position_id`` on ``user_custom_prompts``.
|
||||
|
||||
Note: the running app also auto-adds these via ``_ensure_orm_columns_sync`` and
|
||||
``create_all`` on startup; this migration keeps the alembic history consistent
|
||||
per the repo convention (see backend/CLAUDE.md → Schema Migrations).
|
||||
|
||||
Revision ID: 20260616_01
|
||||
Revises: 20260612_01
|
||||
Create Date: 2026-06-16
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import sqlalchemy as sa
|
||||
from alembic import op
|
||||
from sqlalchemy import inspect
|
||||
|
||||
|
||||
revision = "20260616_01"
|
||||
down_revision = "20260612_01"
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
|
||||
def _has_table(table_name: str) -> bool:
|
||||
return table_name in inspect(op.get_bind()).get_table_names()
|
||||
|
||||
|
||||
def _has_column(table_name: str, column_name: str) -> bool:
|
||||
if not _has_table(table_name):
|
||||
return False
|
||||
return any(col["name"] == column_name for col in inspect(op.get_bind()).get_columns(table_name))
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
if not _has_table("positions"):
|
||||
op.create_table(
|
||||
"positions",
|
||||
sa.Column("id", sa.String(64), primary_key=True),
|
||||
sa.Column("name", sa.String(191), nullable=False),
|
||||
sa.Column("description", sa.String(1024), nullable=False, server_default=""),
|
||||
sa.Column("is_default", sa.Boolean(), nullable=False, server_default=sa.text("0")),
|
||||
sa.Column("created_at", sa.DateTime(timezone=True), nullable=False),
|
||||
sa.Column("updated_at", sa.DateTime(timezone=True), nullable=False),
|
||||
sa.UniqueConstraint("name", name="uq_positions_name"),
|
||||
)
|
||||
op.create_index("ix_positions_is_default", "positions", ["is_default"])
|
||||
|
||||
if not _has_table("position_tag_bindings"):
|
||||
op.create_table(
|
||||
"position_tag_bindings",
|
||||
sa.Column("id", sa.String(64), primary_key=True),
|
||||
sa.Column("position_id", sa.String(64), nullable=False),
|
||||
sa.Column("resource_type", sa.String(32), nullable=False),
|
||||
sa.Column("tag_id", sa.String(64), nullable=False),
|
||||
sa.Column("created_at", sa.DateTime(timezone=True), nullable=False),
|
||||
sa.UniqueConstraint("position_id", "resource_type", "tag_id", name="uq_position_tag_bindings"),
|
||||
)
|
||||
op.create_index("ix_position_tag_bindings_position_id", "position_tag_bindings", ["position_id"])
|
||||
op.create_index("ix_position_tag_bindings_resource_type", "position_tag_bindings", ["resource_type"])
|
||||
op.create_index("ix_position_tag_bindings_tag_id", "position_tag_bindings", ["tag_id"])
|
||||
op.create_index("ix_position_tag_bindings_position_type", "position_tag_bindings", ["position_id", "resource_type"])
|
||||
|
||||
if _has_table("users") and not _has_column("users", "position_id"):
|
||||
op.add_column("users", sa.Column("position_id", sa.String(64), nullable=True))
|
||||
op.create_index("ix_users_position_id", "users", ["position_id"])
|
||||
|
||||
for table in ("agent_favorites", "scheduled_task_subscriptions"):
|
||||
if _has_table(table) and not _has_column(table, "origin"):
|
||||
op.add_column(table, sa.Column("origin", sa.String(16), nullable=False, server_default="user"))
|
||||
if _has_table(table) and not _has_column(table, "position_id"):
|
||||
op.add_column(table, sa.Column("position_id", sa.String(64), nullable=True))
|
||||
op.create_index(f"ix_{table}_position_id", table, ["position_id"])
|
||||
|
||||
if _has_table("user_custom_prompts"):
|
||||
if not _has_column("user_custom_prompts", "is_template"):
|
||||
op.add_column("user_custom_prompts", sa.Column("is_template", sa.Boolean(), nullable=False, server_default=sa.text("0")))
|
||||
op.create_index("ix_user_custom_prompts_is_template", "user_custom_prompts", ["is_template"])
|
||||
if not _has_column("user_custom_prompts", "origin"):
|
||||
op.add_column("user_custom_prompts", sa.Column("origin", sa.String(16), nullable=False, server_default="user"))
|
||||
if not _has_column("user_custom_prompts", "template_id"):
|
||||
op.add_column("user_custom_prompts", sa.Column("template_id", sa.String(64), nullable=True))
|
||||
op.create_index("ix_user_custom_prompts_template_id", "user_custom_prompts", ["template_id"])
|
||||
if not _has_column("user_custom_prompts", "position_id"):
|
||||
op.add_column("user_custom_prompts", sa.Column("position_id", sa.String(64), nullable=True))
|
||||
op.create_index("ix_user_custom_prompts_position_id", "user_custom_prompts", ["position_id"])
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
for table in ("agent_favorites", "scheduled_task_subscriptions"):
|
||||
if _has_column(table, "position_id"):
|
||||
op.drop_column(table, "position_id")
|
||||
if _has_column(table, "origin"):
|
||||
op.drop_column(table, "origin")
|
||||
for col in ("position_id", "template_id", "origin", "is_template"):
|
||||
if _has_column("user_custom_prompts", col):
|
||||
op.drop_column("user_custom_prompts", col)
|
||||
if _has_column("users", "position_id"):
|
||||
op.drop_column("users", "position_id")
|
||||
if _has_table("position_tag_bindings"):
|
||||
op.drop_table("position_tag_bindings")
|
||||
if _has_table("positions"):
|
||||
op.drop_table("positions")
|
||||
+3
@@ -41,6 +41,7 @@ from deerflow.persistence.llm_metrics.model import LlmCallMetricRow
|
||||
from deerflow.persistence.models.run_event import RunEventRow
|
||||
from deerflow.persistence.notifications.model import NotificationRow
|
||||
from deerflow.persistence.parallel_agent_tasks.model import ParallelAgentTaskRow
|
||||
from deerflow.persistence.positions.model import PositionRow, PositionTagBindingRow
|
||||
from deerflow.persistence.recommended_questions.model import RecommendedQuestionRow
|
||||
from deerflow.persistence.roundtable_chains.model import RoundtableChainRow
|
||||
from deerflow.persistence.roundtable_draft_shares.model import RoundtableDraftShareRow
|
||||
@@ -88,6 +89,8 @@ __all__ = [
|
||||
"LlmCallMetricRow",
|
||||
"NotificationRow",
|
||||
"ParallelAgentTaskRow",
|
||||
"PositionRow",
|
||||
"PositionTagBindingRow",
|
||||
"RecommendedQuestionRow",
|
||||
"RoundtableChainRow",
|
||||
"RoundtableDraftRow",
|
||||
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
"""Persistence layer for 岗位 (positions) and per-resource tag bindings."""
|
||||
|
||||
from deerflow.persistence.positions.base import PositionStore
|
||||
from deerflow.persistence.positions.memory import MemoryPositionStore
|
||||
from deerflow.persistence.positions.model import (
|
||||
POSITION_RESOURCE_TYPES,
|
||||
PositionRow,
|
||||
PositionTagBindingRow,
|
||||
)
|
||||
from deerflow.persistence.positions.sql import PositionRepository
|
||||
|
||||
__all__ = [
|
||||
"PositionStore",
|
||||
"MemoryPositionStore",
|
||||
"PositionRepository",
|
||||
"PositionRow",
|
||||
"PositionTagBindingRow",
|
||||
"POSITION_RESOURCE_TYPES",
|
||||
"make_position_store",
|
||||
]
|
||||
|
||||
|
||||
def make_position_store(session_factory):
|
||||
if session_factory is None:
|
||||
return MemoryPositionStore()
|
||||
return PositionRepository(session_factory)
|
||||
+112
@@ -0,0 +1,112 @@
|
||||
"""Abstract persistence API for 岗位 (positions) and their tag bindings."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from abc import ABC, abstractmethod
|
||||
from typing import Any
|
||||
|
||||
|
||||
class PositionStore(ABC):
|
||||
# -------------------------------------------------------------- positions
|
||||
|
||||
@abstractmethod
|
||||
async def list_positions(self) -> list[dict[str, Any]]:
|
||||
"""List all positions. Each record carries a derived ``member_count``."""
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def get_position(self, position_id: str) -> dict[str, Any] | None:
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def create_position(self, data: dict[str, Any]) -> dict[str, Any]:
|
||||
"""Create a position. ``data`` must carry ``id`` and ``name``.
|
||||
|
||||
Raises ``ValueError`` if ``name`` is not unique. When ``is_default`` is
|
||||
truthy, any other default position is cleared first.
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def update_position(self, position_id: str, data: dict[str, Any]) -> dict[str, Any] | None:
|
||||
"""Update ``name`` / ``description`` / ``is_default``.
|
||||
|
||||
Returns ``None`` if the position does not exist. Raises ``ValueError``
|
||||
on a name collision. Setting ``is_default=True`` clears the flag on the
|
||||
other positions.
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def delete_position(self, position_id: str) -> bool:
|
||||
"""Delete a position, its tag bindings, and unassign its members."""
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def get_default_position_id(self) -> str | None:
|
||||
"""Return the id of the ``is_default`` position, or ``None``."""
|
||||
raise NotImplementedError
|
||||
|
||||
# ------------------------------------------------------------ tag bindings
|
||||
|
||||
@abstractmethod
|
||||
async def get_tag_bindings(self, position_id: str) -> dict[str, list[str]]:
|
||||
"""Return ``{resource_type: [tag_id, ...]}`` for one position.
|
||||
|
||||
Resource types with no bound tags are omitted (callers treat a missing
|
||||
key as "use the default set").
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def set_tag_bindings(self, position_id: str, bindings: dict[str, list[str]]) -> dict[str, list[str]]:
|
||||
"""Replace the full set of tag bindings for a position.
|
||||
|
||||
``bindings`` maps each resource_type to its desired tag-id list. A
|
||||
resource_type omitted from ``bindings`` (or mapped to ``[]``) ends up
|
||||
with no rows — i.e. it falls back to the default set.
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
# --------------------------------------------------------------- members
|
||||
|
||||
@abstractmethod
|
||||
async def get_user_position_id(self, user_id: str) -> str | None:
|
||||
"""Return the position id explicitly assigned to a user, or ``None``."""
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def list_members(self, position_id: str) -> list[dict[str, Any]]:
|
||||
"""Return ``[{id, email}, ...]`` of users assigned to this position."""
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def assign_users(self, position_id: str, user_ids: list[str]) -> int:
|
||||
"""Assign a position to many users (1:1 — overwrites any prior position).
|
||||
|
||||
Returns the number of users updated.
|
||||
"""
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def unassign_users(self, user_ids: list[str]) -> int:
|
||||
"""Clear the position of many users. Returns the number updated."""
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def list_member_ids(self, position_id: str) -> list[str]:
|
||||
"""Return just the user ids assigned to this position (sync fan-out)."""
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def list_assigned_user_ids(self) -> list[str]:
|
||||
"""Return every user id that has an explicit position (for bulk resync)."""
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def list_all_users(self) -> list[dict[str, Any]]:
|
||||
"""Return ``[{id, email, system_role, position_id}, ...]`` for every user.
|
||||
|
||||
Powers the admin member-picker and the per-user position editor.
|
||||
"""
|
||||
raise NotImplementedError
|
||||
+143
@@ -0,0 +1,143 @@
|
||||
"""In-memory ``PositionStore`` implementation for tests."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import copy
|
||||
from datetime import UTC, datetime
|
||||
from typing import Any
|
||||
|
||||
|
||||
def _now() -> str:
|
||||
return datetime.now(UTC).isoformat()
|
||||
|
||||
|
||||
class MemoryPositionStore:
|
||||
def __init__(self) -> None:
|
||||
self._positions: dict[str, dict[str, Any]] = {}
|
||||
# position_id -> {resource_type -> [tag_id]}
|
||||
self._bindings: dict[str, dict[str, list[str]]] = {}
|
||||
# user_id -> position_id
|
||||
self._user_position: dict[str, str] = {}
|
||||
# user_id -> email (optional; populated via register_user for nicer member lists)
|
||||
self._user_email: dict[str, str] = {}
|
||||
|
||||
# test helper — not part of the abstract API
|
||||
def register_user(self, user_id: str, email: str = "") -> None:
|
||||
self._user_email[user_id] = email
|
||||
|
||||
def _member_count(self, position_id: str) -> int:
|
||||
return sum(1 for pid in self._user_position.values() if pid == position_id)
|
||||
|
||||
def _to_dict(self, record: dict[str, Any]) -> dict[str, Any]:
|
||||
out = copy.deepcopy(record)
|
||||
out["member_count"] = self._member_count(record["id"])
|
||||
return out
|
||||
|
||||
# -------------------------------------------------------------- positions
|
||||
|
||||
async def list_positions(self) -> list[dict[str, Any]]:
|
||||
rows = sorted(self._positions.values(), key=lambda r: r["created_at"])
|
||||
return [self._to_dict(r) for r in rows]
|
||||
|
||||
async def get_position(self, position_id: str) -> dict[str, Any] | None:
|
||||
record = self._positions.get(position_id)
|
||||
return self._to_dict(record) if record is not None else None
|
||||
|
||||
def _clear_default(self, keep_id: str | None) -> None:
|
||||
for r in self._positions.values():
|
||||
if r["id"] != keep_id:
|
||||
r["is_default"] = False
|
||||
|
||||
async def create_position(self, data: dict[str, Any]) -> dict[str, Any]:
|
||||
name = data["name"]
|
||||
if any(r["name"] == name for r in self._positions.values()):
|
||||
raise ValueError(f"Position '{name}' already exists")
|
||||
is_default = bool(data.get("is_default"))
|
||||
if is_default:
|
||||
self._clear_default(keep_id=data["id"])
|
||||
record = {
|
||||
"id": data["id"],
|
||||
"name": name,
|
||||
"description": data.get("description") or "",
|
||||
"is_default": is_default,
|
||||
"created_at": _now(),
|
||||
"updated_at": _now(),
|
||||
}
|
||||
self._positions[data["id"]] = record
|
||||
return self._to_dict(record)
|
||||
|
||||
async def update_position(self, position_id: str, data: dict[str, Any]) -> dict[str, Any] | None:
|
||||
record = self._positions.get(position_id)
|
||||
if record is None:
|
||||
return None
|
||||
new_name = data.get("name", record["name"])
|
||||
if new_name is not None and any(r["id"] != position_id and r["name"] == new_name for r in self._positions.values()):
|
||||
raise ValueError(f"Position '{new_name}' already exists")
|
||||
if "name" in data and data["name"] is not None:
|
||||
record["name"] = data["name"]
|
||||
if "description" in data and data["description"] is not None:
|
||||
record["description"] = data["description"]
|
||||
if "is_default" in data and data["is_default"] is not None:
|
||||
record["is_default"] = bool(data["is_default"])
|
||||
if record["is_default"]:
|
||||
self._clear_default(keep_id=position_id)
|
||||
record["updated_at"] = _now()
|
||||
return self._to_dict(record)
|
||||
|
||||
async def delete_position(self, position_id: str) -> bool:
|
||||
if position_id not in self._positions:
|
||||
return False
|
||||
del self._positions[position_id]
|
||||
self._bindings.pop(position_id, None)
|
||||
for uid in [uid for uid, pid in self._user_position.items() if pid == position_id]:
|
||||
del self._user_position[uid]
|
||||
return True
|
||||
|
||||
async def get_default_position_id(self) -> str | None:
|
||||
for r in self._positions.values():
|
||||
if r["is_default"]:
|
||||
return r["id"]
|
||||
return None
|
||||
|
||||
# ------------------------------------------------------------ tag bindings
|
||||
|
||||
async def get_tag_bindings(self, position_id: str) -> dict[str, list[str]]:
|
||||
return copy.deepcopy(self._bindings.get(position_id, {}))
|
||||
|
||||
async def set_tag_bindings(self, position_id: str, bindings: dict[str, list[str]]) -> dict[str, list[str]]:
|
||||
cleaned = {rt: list(dict.fromkeys(tag_ids)) for rt, tag_ids in bindings.items() if tag_ids}
|
||||
self._bindings[position_id] = cleaned
|
||||
return copy.deepcopy(cleaned)
|
||||
|
||||
# --------------------------------------------------------------- members
|
||||
|
||||
async def get_user_position_id(self, user_id: str) -> str | None:
|
||||
return self._user_position.get(user_id)
|
||||
|
||||
async def list_members(self, position_id: str) -> list[dict[str, Any]]:
|
||||
return [{"id": uid, "email": self._user_email.get(uid, "")} for uid, pid in self._user_position.items() if pid == position_id]
|
||||
|
||||
async def assign_users(self, position_id: str, user_ids: list[str]) -> int:
|
||||
for uid in user_ids:
|
||||
self._user_position[uid] = position_id
|
||||
return len(user_ids)
|
||||
|
||||
async def unassign_users(self, user_ids: list[str]) -> int:
|
||||
count = 0
|
||||
for uid in user_ids:
|
||||
if uid in self._user_position:
|
||||
del self._user_position[uid]
|
||||
count += 1
|
||||
return count
|
||||
|
||||
async def list_member_ids(self, position_id: str) -> list[str]:
|
||||
return [uid for uid, pid in self._user_position.items() if pid == position_id]
|
||||
|
||||
async def list_assigned_user_ids(self) -> list[str]:
|
||||
return list(self._user_position.keys())
|
||||
|
||||
async def list_all_users(self) -> list[dict[str, Any]]:
|
||||
return [
|
||||
{"id": uid, "email": email, "system_role": "user", "position_id": self._user_position.get(uid)}
|
||||
for uid, email in sorted(self._user_email.items(), key=lambda kv: kv[1])
|
||||
]
|
||||
+73
@@ -0,0 +1,73 @@
|
||||
"""ORM models for 岗位 (positions) and their per-resource tag bindings.
|
||||
|
||||
A **position** (岗位) is an admin-managed aggregation layer that decides which
|
||||
agents / skills / scheduled tasks / custom prompts / recommended questions a
|
||||
user is subscribed to. Each user has at most one position (the link lives on
|
||||
``users.position_id``, a 1:1 relation — see ``UserRow``).
|
||||
|
||||
Two tables here:
|
||||
|
||||
- ``positions`` — the position itself. ``is_default`` marks the fallback
|
||||
position inherited by users who have not been assigned one explicitly.
|
||||
- ``position_tag_bindings`` — for each ``(position, resource_type)`` the set of
|
||||
tags whose resources are granted to the position's members. **No binding for
|
||||
a resource_type means "use the default set"** (see ``deerflow.services.
|
||||
position_sync`` for what "default" resolves to per type).
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import UTC, datetime
|
||||
|
||||
from sqlalchemy import Boolean, Index, String, UniqueConstraint
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from deerflow.persistence.base import Base
|
||||
from deerflow.persistence.types import BeijingDateTime
|
||||
|
||||
# Resource types a position can grant. The first three reuse the existing
|
||||
# typed-tag namespace (``deerflow.persistence.tags``); ``user_prompt`` and
|
||||
# ``recommended_question`` are added by the same change (see TAG_TYPES).
|
||||
POSITION_RESOURCE_TYPES: tuple[str, ...] = (
|
||||
"agent",
|
||||
"skill",
|
||||
"scheduled_task",
|
||||
"user_prompt",
|
||||
"recommended_question",
|
||||
)
|
||||
|
||||
|
||||
class PositionRow(Base):
|
||||
__tablename__ = "positions"
|
||||
__table_args__ = (UniqueConstraint("name", name="uq_positions_name"),)
|
||||
|
||||
id: Mapped[str] = mapped_column(String(64), primary_key=True)
|
||||
name: Mapped[str] = mapped_column(String(191), nullable=False)
|
||||
description: Mapped[str] = mapped_column(String(1024), nullable=False, default="")
|
||||
# Exactly one position should carry ``is_default=True`` at a time (the
|
||||
# router enforces "only one default" by clearing the flag on others). Users
|
||||
# with no explicit ``users.position_id`` inherit this position's grants.
|
||||
is_default: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False, index=True)
|
||||
created_at: Mapped[datetime] = mapped_column(BeijingDateTime(), nullable=False, default=lambda: datetime.now(UTC))
|
||||
updated_at: Mapped[datetime] = mapped_column(BeijingDateTime(), nullable=False, default=lambda: datetime.now(UTC), onupdate=lambda: datetime.now(UTC))
|
||||
|
||||
|
||||
class PositionTagBindingRow(Base):
|
||||
"""One bound tag for a ``(position, resource_type)`` pair.
|
||||
|
||||
The absence of *any* row for a ``(position, resource_type)`` means the
|
||||
position uses the **default set** for that resource type. One or more rows
|
||||
mean the position grants the *union* of the resources carrying those tags.
|
||||
"""
|
||||
|
||||
__tablename__ = "position_tag_bindings"
|
||||
__table_args__ = (
|
||||
UniqueConstraint("position_id", "resource_type", "tag_id", name="uq_position_tag_bindings"),
|
||||
Index("ix_position_tag_bindings_position_type", "position_id", "resource_type"),
|
||||
)
|
||||
|
||||
id: Mapped[str] = mapped_column(String(64), primary_key=True)
|
||||
position_id: Mapped[str] = mapped_column(String(64), nullable=False, index=True)
|
||||
resource_type: Mapped[str] = mapped_column(String(32), nullable=False, index=True)
|
||||
tag_id: Mapped[str] = mapped_column(String(64), nullable=False, index=True)
|
||||
created_at: Mapped[datetime] = mapped_column(BeijingDateTime(), nullable=False, default=lambda: datetime.now(UTC))
|
||||
+196
@@ -0,0 +1,196 @@
|
||||
"""SQLAlchemy-backed position + tag-binding repository."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import uuid
|
||||
from datetime import UTC, datetime
|
||||
from typing import Any
|
||||
|
||||
from sqlalchemy import delete, func, select, update
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
|
||||
|
||||
from deerflow.persistence.positions.base import PositionStore
|
||||
from deerflow.persistence.positions.model import PositionRow, PositionTagBindingRow
|
||||
from deerflow.persistence.user.model import UserRow
|
||||
|
||||
|
||||
def _position_to_dict(row: PositionRow, member_count: int = 0) -> dict[str, Any]:
|
||||
data = row.to_dict()
|
||||
for key in ("created_at", "updated_at"):
|
||||
value = data.get(key)
|
||||
if isinstance(value, datetime):
|
||||
data[key] = value.isoformat()
|
||||
data["member_count"] = member_count
|
||||
return data
|
||||
|
||||
|
||||
class PositionRepository(PositionStore):
|
||||
def __init__(self, session_factory: async_sessionmaker[AsyncSession]) -> None:
|
||||
self._sf = session_factory
|
||||
|
||||
@staticmethod
|
||||
async def _member_counts(session: AsyncSession, position_ids: list[str]) -> dict[str, int]:
|
||||
if not position_ids:
|
||||
return {}
|
||||
stmt = select(UserRow.position_id, func.count()).where(UserRow.position_id.in_(position_ids)).group_by(UserRow.position_id)
|
||||
result = await session.execute(stmt)
|
||||
return {pid: count for pid, count in result.all() if pid is not None}
|
||||
|
||||
@staticmethod
|
||||
async def _clear_default(session: AsyncSession, keep_id: str | None) -> None:
|
||||
stmt = update(PositionRow).where(PositionRow.is_default.is_(True))
|
||||
if keep_id is not None:
|
||||
stmt = stmt.where(PositionRow.id != keep_id)
|
||||
await session.execute(stmt.values(is_default=False))
|
||||
|
||||
# -------------------------------------------------------------- positions
|
||||
|
||||
async def list_positions(self) -> list[dict[str, Any]]:
|
||||
async with self._sf() as session:
|
||||
rows = list((await session.execute(select(PositionRow).order_by(PositionRow.created_at.asc()))).scalars())
|
||||
counts = await self._member_counts(session, [r.id for r in rows])
|
||||
return [_position_to_dict(r, counts.get(r.id, 0)) for r in rows]
|
||||
|
||||
async def get_position(self, position_id: str) -> dict[str, Any] | None:
|
||||
async with self._sf() as session:
|
||||
row = await session.get(PositionRow, position_id)
|
||||
if row is None:
|
||||
return None
|
||||
counts = await self._member_counts(session, [position_id])
|
||||
return _position_to_dict(row, counts.get(position_id, 0))
|
||||
|
||||
async def create_position(self, data: dict[str, Any]) -> dict[str, Any]:
|
||||
now = datetime.now(UTC)
|
||||
is_default = bool(data.get("is_default"))
|
||||
row = PositionRow(
|
||||
id=data["id"],
|
||||
name=data["name"],
|
||||
description=data.get("description") or "",
|
||||
is_default=is_default,
|
||||
created_at=now,
|
||||
updated_at=now,
|
||||
)
|
||||
async with self._sf() as session:
|
||||
if is_default:
|
||||
await self._clear_default(session, keep_id=row.id)
|
||||
session.add(row)
|
||||
try:
|
||||
await session.commit()
|
||||
except IntegrityError as exc:
|
||||
await session.rollback()
|
||||
raise ValueError(f"Position '{data['name']}' already exists") from exc
|
||||
await session.refresh(row)
|
||||
return _position_to_dict(row, 0)
|
||||
|
||||
async def update_position(self, position_id: str, data: dict[str, Any]) -> dict[str, Any] | None:
|
||||
async with self._sf() as session:
|
||||
row = await session.get(PositionRow, position_id)
|
||||
if row is None:
|
||||
return None
|
||||
if "name" in data and data["name"] is not None:
|
||||
row.name = data["name"]
|
||||
if "description" in data and data["description"] is not None:
|
||||
row.description = data["description"]
|
||||
if "is_default" in data and data["is_default"] is not None:
|
||||
row.is_default = bool(data["is_default"])
|
||||
if row.is_default:
|
||||
await self._clear_default(session, keep_id=position_id)
|
||||
row.updated_at = datetime.now(UTC)
|
||||
try:
|
||||
await session.commit()
|
||||
except IntegrityError as exc:
|
||||
await session.rollback()
|
||||
raise ValueError(f"Position '{data.get('name')}' already exists") from exc
|
||||
await session.refresh(row)
|
||||
counts = await self._member_counts(session, [position_id])
|
||||
return _position_to_dict(row, counts.get(position_id, 0))
|
||||
|
||||
async def delete_position(self, position_id: str) -> bool:
|
||||
async with self._sf() as session:
|
||||
row = await session.get(PositionRow, position_id)
|
||||
if row is None:
|
||||
return False
|
||||
await session.execute(delete(PositionTagBindingRow).where(PositionTagBindingRow.position_id == position_id))
|
||||
await session.execute(update(UserRow).where(UserRow.position_id == position_id).values(position_id=None))
|
||||
await session.delete(row)
|
||||
await session.commit()
|
||||
return True
|
||||
|
||||
async def get_default_position_id(self) -> str | None:
|
||||
async with self._sf() as session:
|
||||
return (await session.execute(select(PositionRow.id).where(PositionRow.is_default.is_(True)).limit(1))).scalar_one_or_none()
|
||||
|
||||
# ------------------------------------------------------------ tag bindings
|
||||
|
||||
async def get_tag_bindings(self, position_id: str) -> dict[str, list[str]]:
|
||||
async with self._sf() as session:
|
||||
rows = list(
|
||||
(
|
||||
await session.execute(
|
||||
select(PositionTagBindingRow).where(PositionTagBindingRow.position_id == position_id).order_by(PositionTagBindingRow.created_at.asc())
|
||||
)
|
||||
).scalars()
|
||||
)
|
||||
out: dict[str, list[str]] = {}
|
||||
for r in rows:
|
||||
out.setdefault(r.resource_type, []).append(r.tag_id)
|
||||
return out
|
||||
|
||||
async def set_tag_bindings(self, position_id: str, bindings: dict[str, list[str]]) -> dict[str, list[str]]:
|
||||
now = datetime.now(UTC)
|
||||
async with self._sf() as session:
|
||||
await session.execute(delete(PositionTagBindingRow).where(PositionTagBindingRow.position_id == position_id))
|
||||
for resource_type, tag_ids in bindings.items():
|
||||
for tag_id in dict.fromkeys(tag_ids):
|
||||
session.add(
|
||||
PositionTagBindingRow(
|
||||
id=uuid.uuid4().hex,
|
||||
position_id=position_id,
|
||||
resource_type=resource_type,
|
||||
tag_id=tag_id,
|
||||
created_at=now,
|
||||
)
|
||||
)
|
||||
await session.commit()
|
||||
return await self.get_tag_bindings(position_id)
|
||||
|
||||
# --------------------------------------------------------------- members
|
||||
|
||||
async def get_user_position_id(self, user_id: str) -> str | None:
|
||||
async with self._sf() as session:
|
||||
return (await session.execute(select(UserRow.position_id).where(UserRow.id == user_id))).scalar_one_or_none()
|
||||
|
||||
async def list_members(self, position_id: str) -> list[dict[str, Any]]:
|
||||
async with self._sf() as session:
|
||||
rows = (await session.execute(select(UserRow.id, UserRow.email).where(UserRow.position_id == position_id).order_by(UserRow.email.asc()))).all()
|
||||
return [{"id": uid, "email": email} for uid, email in rows]
|
||||
|
||||
async def assign_users(self, position_id: str, user_ids: list[str]) -> int:
|
||||
if not user_ids:
|
||||
return 0
|
||||
async with self._sf() as session:
|
||||
result = await session.execute(update(UserRow).where(UserRow.id.in_(user_ids)).values(position_id=position_id))
|
||||
await session.commit()
|
||||
return result.rowcount or 0
|
||||
|
||||
async def unassign_users(self, user_ids: list[str]) -> int:
|
||||
if not user_ids:
|
||||
return 0
|
||||
async with self._sf() as session:
|
||||
result = await session.execute(update(UserRow).where(UserRow.id.in_(user_ids)).values(position_id=None))
|
||||
await session.commit()
|
||||
return result.rowcount or 0
|
||||
|
||||
async def list_member_ids(self, position_id: str) -> list[str]:
|
||||
async with self._sf() as session:
|
||||
return [uid for (uid,) in (await session.execute(select(UserRow.id).where(UserRow.position_id == position_id))).all()]
|
||||
|
||||
async def list_assigned_user_ids(self) -> list[str]:
|
||||
async with self._sf() as session:
|
||||
return [uid for (uid,) in (await session.execute(select(UserRow.id).where(UserRow.position_id.isnot(None)))).all()]
|
||||
|
||||
async def list_all_users(self) -> list[dict[str, Any]]:
|
||||
async with self._sf() as session:
|
||||
rows = (await session.execute(select(UserRow.id, UserRow.email, UserRow.system_role, UserRow.position_id).order_by(UserRow.email.asc()))).all()
|
||||
return [{"id": uid, "email": email, "system_role": role, "position_id": pid} for uid, email, role, pid in rows]
|
||||
+5
@@ -55,6 +55,11 @@ class ScheduledTaskSubscriptionRow(Base):
|
||||
task_id: Mapped[str] = mapped_column(String(64), index=True)
|
||||
user_id: Mapped[str] = mapped_column(String(64), index=True)
|
||||
notify_element: Mapped[bool] = mapped_column(Boolean, default=False)
|
||||
# Source of this subscription: ``"user"`` (subscribed manually from the
|
||||
# 广场) or ``"position"`` (auto-granted by the user's 岗位 via the sync
|
||||
# engine). Sync only ever touches ``"position"`` rows.
|
||||
origin: Mapped[str] = mapped_column(String(16), nullable=False, default="user", server_default="user")
|
||||
position_id: Mapped[str | None] = mapped_column(String(64), nullable=True, index=True)
|
||||
created_at: Mapped[datetime] = mapped_column(BeijingDateTime(), default=lambda: datetime.now(UTC))
|
||||
updated_at: Mapped[datetime] = mapped_column(BeijingDateTime(), default=lambda: datetime.now(UTC), onupdate=lambda: datetime.now(UTC))
|
||||
|
||||
|
||||
@@ -71,3 +71,14 @@ class TagStore(ABC):
|
||||
async def unassign_all(self, target_type: str, target_id: str) -> int:
|
||||
"""Drop every tag assignment for a resource. Returns the count removed."""
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def list_targets_for_tags(self, target_type: str, tag_ids: list[str]) -> list[str]:
|
||||
"""Return the ids of ``target_type`` resources carrying ANY of ``tag_ids`` (OR).
|
||||
|
||||
Reverse of :meth:`list_assignments`. Powers the 岗位 (position) sync
|
||||
engine and the per-position visibility filters: "which resources does
|
||||
this set of tags grant?". Returns a de-duplicated list; empty when
|
||||
``tag_ids`` is empty.
|
||||
"""
|
||||
raise NotImplementedError
|
||||
@@ -136,3 +136,15 @@ class MemoryTagStore(TagStore):
|
||||
for aid in victims:
|
||||
del self._assignments[aid]
|
||||
return len(victims)
|
||||
|
||||
async def list_targets_for_tags(self, target_type: str, tag_ids: list[str]) -> list[str]:
|
||||
wanted = set(tag_ids)
|
||||
if not wanted:
|
||||
return []
|
||||
out: list[str] = []
|
||||
seen: set[str] = set()
|
||||
for a in self._assignments.values():
|
||||
if a["target_type"] == target_type and a["tag_id"] in wanted and a["target_id"] not in seen:
|
||||
seen.add(a["target_id"])
|
||||
out.append(a["target_id"])
|
||||
return out
|
||||
+3
-1
@@ -21,7 +21,9 @@ from deerflow.persistence.base import Base
|
||||
from deerflow.persistence.types import BeijingDateTime
|
||||
|
||||
# Allowed tag/target types. Kept here so persistence + API share one source.
|
||||
TAG_TYPES: tuple[str, ...] = ("agent", "skill", "scheduled_task")
|
||||
# ``user_prompt`` / ``recommended_question`` were added for the 岗位 (position)
|
||||
# subscription system so those resources can be tag-targeted like agents/skills.
|
||||
TAG_TYPES: tuple[str, ...] = ("agent", "skill", "scheduled_task", "user_prompt", "recommended_question")
|
||||
|
||||
|
||||
class TagRow(Base):
|
||||
|
||||
@@ -185,3 +185,15 @@ class TagRepository(TagStore):
|
||||
)
|
||||
await session.commit()
|
||||
return result.rowcount or 0
|
||||
|
||||
async def list_targets_for_tags(self, target_type: str, tag_ids: list[str]) -> list[str]:
|
||||
unique_ids = list(dict.fromkeys(tag_ids))
|
||||
if not unique_ids:
|
||||
return []
|
||||
stmt = (
|
||||
select(TagAssignmentRow.target_id)
|
||||
.where(TagAssignmentRow.target_type == target_type, TagAssignmentRow.tag_id.in_(unique_ids))
|
||||
.distinct()
|
||||
)
|
||||
async with self._sf() as session:
|
||||
return [tid for (tid,) in (await session.execute(stmt)).all()]
|
||||
@@ -49,6 +49,11 @@ class UserRow(Base):
|
||||
needs_setup: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
|
||||
token_version: Mapped[int] = mapped_column(nullable=False, default=0)
|
||||
|
||||
# 岗位 (position) the user is assigned to (1:1). NULL = no explicit
|
||||
# position → the user inherits the ``is_default`` position's grants. Drives
|
||||
# the subscription sync engine (see ``deerflow.services.position_sync``).
|
||||
position_id: Mapped[str | None] = mapped_column(String(64), nullable=True, index=True)
|
||||
|
||||
__table_args__ = (
|
||||
Index(
|
||||
"idx_users_oauth_identity",
|
||||
|
||||
+14
-1
@@ -4,7 +4,7 @@ from __future__ import annotations
|
||||
|
||||
from datetime import UTC, datetime
|
||||
|
||||
from sqlalchemy import Integer, String, Text
|
||||
from sqlalchemy import Boolean, Integer, String, Text
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from deerflow.persistence.base import Base
|
||||
@@ -22,5 +22,18 @@ class UserCustomPromptRow(Base):
|
||||
# Optional association to a single agent. NULL = global (shown everywhere);
|
||||
# otherwise the prompt only surfaces when that agent is selected.
|
||||
agent_id: Mapped[str | None] = mapped_column(String(64), nullable=True, index=True)
|
||||
# When True, this row is an admin-maintained **template** (not a user's own
|
||||
# prompt). Templates are tag-targeted (via TagAssignmentRow,
|
||||
# target_type='user_prompt') and cloned into a user's prompts by the 岗位
|
||||
# sync engine. ``user_id`` of a template holds the admin's id (audit only).
|
||||
is_template: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False, server_default="0", index=True)
|
||||
# Source of a non-template row: ``"user"`` (created by the user) or
|
||||
# ``"position"`` (cloned from a template by the sync engine). Sync only
|
||||
# touches ``"position"`` rows.
|
||||
origin: Mapped[str] = mapped_column(String(16), nullable=False, default="user", server_default="user")
|
||||
# For ``origin='position'`` clones: the template this row was cloned from
|
||||
# (so re-sync can reconcile by template id) and the granting position.
|
||||
template_id: Mapped[str | None] = mapped_column(String(64), nullable=True, index=True)
|
||||
position_id: Mapped[str | None] = mapped_column(String(64), nullable=True, index=True)
|
||||
created_at: Mapped[datetime] = mapped_column(BeijingDateTime(), nullable=False, default=lambda: datetime.now(UTC))
|
||||
updated_at: Mapped[datetime] = mapped_column(BeijingDateTime(), nullable=False, default=lambda: datetime.now(UTC), onupdate=lambda: datetime.now(UTC))
|
||||
+62
-1
@@ -25,15 +25,76 @@ class UserCustomPromptRepository:
|
||||
self._sf = session_factory
|
||||
|
||||
async def list_for_user(self, user_id: str) -> list[dict[str, Any]]:
|
||||
# Exclude admin templates (``is_template=True``) — those are not a
|
||||
# user's own prompts; position-cloned rows (``is_template=False``,
|
||||
# ``origin='position'``) DO show, so the user sees their 岗位 prompts.
|
||||
stmt = (
|
||||
select(UserCustomPromptRow)
|
||||
.where(UserCustomPromptRow.user_id == user_id)
|
||||
.where(UserCustomPromptRow.user_id == user_id, UserCustomPromptRow.is_template.is_(False))
|
||||
.order_by(UserCustomPromptRow.sort_order.asc(), UserCustomPromptRow.created_at.asc())
|
||||
)
|
||||
async with self._sf() as session:
|
||||
result = await session.execute(stmt)
|
||||
return [_row_to_dict(row) for row in result.scalars()]
|
||||
|
||||
# ----------------------------------------------------- admin templates
|
||||
|
||||
async def list_templates(self) -> list[dict[str, Any]]:
|
||||
stmt = select(UserCustomPromptRow).where(UserCustomPromptRow.is_template.is_(True)).order_by(UserCustomPromptRow.sort_order.asc(), UserCustomPromptRow.created_at.asc())
|
||||
async with self._sf() as session:
|
||||
return [_row_to_dict(row) for row in (await session.execute(stmt)).scalars()]
|
||||
|
||||
async def get_template(self, template_id: str) -> dict[str, Any] | None:
|
||||
async with self._sf() as session:
|
||||
row = await session.get(UserCustomPromptRow, template_id)
|
||||
if row is None or not row.is_template:
|
||||
return None
|
||||
return _row_to_dict(row)
|
||||
|
||||
async def create_template(self, admin_user_id: str, data: dict[str, Any]) -> dict[str, Any]:
|
||||
now = datetime.now(UTC)
|
||||
row = UserCustomPromptRow(
|
||||
id=data["id"],
|
||||
user_id=admin_user_id,
|
||||
title=data.get("title") or "",
|
||||
content=data["content"],
|
||||
sort_order=data.get("sort_order", 0),
|
||||
agent_id=(data.get("agent_id") or None),
|
||||
is_template=True,
|
||||
origin="user",
|
||||
created_at=now,
|
||||
updated_at=now,
|
||||
)
|
||||
async with self._sf() as session:
|
||||
session.add(row)
|
||||
await session.commit()
|
||||
await session.refresh(row)
|
||||
return _row_to_dict(row)
|
||||
|
||||
async def update_template(self, template_id: str, data: dict[str, Any]) -> dict[str, Any] | None:
|
||||
async with self._sf() as session:
|
||||
row = await session.get(UserCustomPromptRow, template_id)
|
||||
if row is None or not row.is_template:
|
||||
return None
|
||||
for key in ("title", "content", "sort_order"):
|
||||
if key in data:
|
||||
setattr(row, key, data[key])
|
||||
if "agent_id" in data:
|
||||
row.agent_id = data["agent_id"] or None
|
||||
row.updated_at = datetime.now(UTC)
|
||||
await session.commit()
|
||||
await session.refresh(row)
|
||||
return _row_to_dict(row)
|
||||
|
||||
async def delete_template(self, template_id: str) -> bool:
|
||||
async with self._sf() as session:
|
||||
row = await session.get(UserCustomPromptRow, template_id)
|
||||
if row is None or not row.is_template:
|
||||
return False
|
||||
await session.delete(row)
|
||||
await session.commit()
|
||||
return True
|
||||
|
||||
async def create(self, user_id: str, data: dict[str, Any]) -> dict[str, Any]:
|
||||
now = datetime.now(UTC)
|
||||
row = UserCustomPromptRow(
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
"""Cross-cutting harness services (no ``app.*`` imports)."""
|
||||
@@ -0,0 +1,220 @@
|
||||
"""岗位 (position) → resource subscription **sync engine**.
|
||||
|
||||
A user's position decides which agents / scheduled tasks / custom prompts they
|
||||
are subscribed to, and which skills / recommended questions they can see. This
|
||||
service turns a position's *tag bindings* into concrete, materialized rows in
|
||||
the existing "我的" tables (idempotent, re-runnable).
|
||||
|
||||
Resolution rule (per resource type):
|
||||
|
||||
* The user's position is ``users.position_id``; if unset, the ``is_default``
|
||||
position is used; if there is none, every type falls back to its default set.
|
||||
* For a resource type **with** bound tags → the union of resources carrying any
|
||||
of those tags.
|
||||
* For a resource type **without** bound tags → the *default set*:
|
||||
- ``agent`` → all built-in agents (``user_id IS NULL``)
|
||||
- ``scheduled_task`` → empty (no built-in tasks)
|
||||
- ``user_prompt`` → admin templates that carry no tag
|
||||
- ``skill`` / ``recommended_question`` → *unrestricted* (handled at query
|
||||
time, never materialized — see :meth:`resolve_visible`)
|
||||
|
||||
Materialization (``sync_user``) only ever touches rows it created itself
|
||||
(``origin='position'``), so a user's own favorites / subscriptions / prompts are
|
||||
never clobbered. The skill + recommended-question visibility filters are
|
||||
computed live by :meth:`resolve_visible` and are *not* materialized.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
import uuid
|
||||
from datetime import UTC, datetime
|
||||
|
||||
from sqlalchemy import delete, select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
|
||||
|
||||
from deerflow.persistence.agents.model import AgentFavoriteRow, AgentRow
|
||||
from deerflow.persistence.positions.base import PositionStore
|
||||
from deerflow.persistence.scheduled_tasks.model import ScheduledTaskSubscriptionRow
|
||||
from deerflow.persistence.tags.base import TagStore
|
||||
from deerflow.persistence.user_prompts.model import UserCustomPromptRow
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Materialized into "我的" tables by sync_user.
|
||||
_MATERIALIZED_TYPES = ("agent", "scheduled_task", "user_prompt")
|
||||
# Resolved live at query time (visibility filters), never materialized.
|
||||
_VISIBILITY_TYPES = ("skill", "recommended_question")
|
||||
|
||||
|
||||
class PositionSyncService:
|
||||
def __init__(self, session_factory: async_sessionmaker[AsyncSession], position_store: PositionStore, tag_store: TagStore) -> None:
|
||||
self._sf = session_factory
|
||||
self._positions = position_store
|
||||
self._tags = tag_store
|
||||
|
||||
# ----------------------------------------------------------- resolution
|
||||
|
||||
async def _effective_position_id(self, user_id: str) -> str | None:
|
||||
pid = await self._positions.get_user_position_id(user_id)
|
||||
if pid:
|
||||
return pid
|
||||
return await self._positions.get_default_position_id()
|
||||
|
||||
async def resolve_visible(self, user_id: str, resource_type: str) -> set[str] | None:
|
||||
"""Return the set of visible ``resource_type`` ids, or ``None`` = unrestricted.
|
||||
|
||||
Used by the skills list + recommended-questions filters. ``None`` means
|
||||
"no position restriction → show everything"; a set means "restrict to
|
||||
exactly these ids".
|
||||
"""
|
||||
pid = await self._effective_position_id(user_id)
|
||||
if not pid:
|
||||
return None
|
||||
bindings = await self._positions.get_tag_bindings(pid)
|
||||
tag_ids = bindings.get(resource_type) or []
|
||||
if not tag_ids:
|
||||
return None
|
||||
return set(await self._tags.list_targets_for_tags(resource_type, tag_ids))
|
||||
|
||||
async def _resolve_materialized(self, user_id: str, resource_type: str, session: AsyncSession) -> set[str]:
|
||||
pid = await self._effective_position_id(user_id)
|
||||
bindings = await self._positions.get_tag_bindings(pid) if pid else {}
|
||||
tag_ids = bindings.get(resource_type) or []
|
||||
if tag_ids:
|
||||
return set(await self._tags.list_targets_for_tags(resource_type, tag_ids))
|
||||
return await self._default_set(resource_type, session)
|
||||
|
||||
async def _default_set(self, resource_type: str, session: AsyncSession) -> set[str]:
|
||||
if resource_type == "agent":
|
||||
rows = (await session.execute(select(AgentRow.id).where(AgentRow.user_id.is_(None)))).all()
|
||||
return {r[0] for r in rows}
|
||||
if resource_type == "scheduled_task":
|
||||
return set()
|
||||
if resource_type == "user_prompt":
|
||||
# Admin templates that carry no tag = global default templates.
|
||||
template_ids = {r[0] for r in (await session.execute(select(UserCustomPromptRow.id).where(UserCustomPromptRow.is_template.is_(True)))).all()}
|
||||
if not template_ids:
|
||||
return set()
|
||||
tagged = set(await self._tags.list_targets_for_tags("user_prompt", await self._all_user_prompt_tag_ids()))
|
||||
return template_ids - tagged
|
||||
return set()
|
||||
|
||||
async def _all_user_prompt_tag_ids(self) -> list[str]:
|
||||
return [t["id"] for t in await self._tags.list_tags("user_prompt")]
|
||||
|
||||
# --------------------------------------------------------- materialize
|
||||
|
||||
async def sync_user(self, user_id: str) -> None:
|
||||
"""Reconcile all materialized subscriptions for one user (idempotent)."""
|
||||
if self._sf is None:
|
||||
return
|
||||
pid = await self._effective_position_id(user_id)
|
||||
async with self._sf() as session:
|
||||
await self._sync_agents(session, user_id, pid)
|
||||
await self._sync_tasks(session, user_id, pid)
|
||||
await self._sync_prompts(session, user_id, pid)
|
||||
await session.commit()
|
||||
|
||||
async def _sync_agents(self, session: AsyncSession, user_id: str, position_id: str | None) -> None:
|
||||
target = await self._resolve_materialized(user_id, "agent", session)
|
||||
rows = list((await session.execute(select(AgentFavoriteRow).where(AgentFavoriteRow.user_id == user_id))).scalars())
|
||||
owned_any = {r.agent_id for r in rows}
|
||||
position_rows = {r.agent_id: r for r in rows if r.origin == "position"}
|
||||
now = datetime.now(UTC)
|
||||
for agent_id in target - owned_any:
|
||||
session.add(AgentFavoriteRow(id=uuid.uuid4().hex, user_id=user_id, agent_id=agent_id, origin="position", position_id=position_id, created_at=now))
|
||||
for agent_id, row in position_rows.items():
|
||||
if agent_id not in target:
|
||||
await session.delete(row)
|
||||
|
||||
async def _sync_tasks(self, session: AsyncSession, user_id: str, position_id: str | None) -> None:
|
||||
target = await self._resolve_materialized(user_id, "scheduled_task", session)
|
||||
rows = list((await session.execute(select(ScheduledTaskSubscriptionRow).where(ScheduledTaskSubscriptionRow.user_id == user_id))).scalars())
|
||||
owned_any = {r.task_id for r in rows}
|
||||
position_rows = {r.task_id: r for r in rows if r.origin == "position"}
|
||||
now = datetime.now(UTC)
|
||||
for task_id in target - owned_any:
|
||||
session.add(ScheduledTaskSubscriptionRow(id=uuid.uuid4().hex, task_id=task_id, user_id=user_id, notify_element=False, origin="position", position_id=position_id, created_at=now, updated_at=now))
|
||||
for task_id, row in position_rows.items():
|
||||
if task_id not in target:
|
||||
await session.delete(row)
|
||||
|
||||
async def _sync_prompts(self, session: AsyncSession, user_id: str, position_id: str | None) -> None:
|
||||
target_template_ids = await self._resolve_materialized(user_id, "user_prompt", session)
|
||||
# Load the templates we need to clone, so we can copy their content.
|
||||
templates: dict[str, UserCustomPromptRow] = {}
|
||||
if target_template_ids:
|
||||
for row in (await session.execute(select(UserCustomPromptRow).where(UserCustomPromptRow.id.in_(target_template_ids), UserCustomPromptRow.is_template.is_(True)))).scalars():
|
||||
templates[row.id] = row
|
||||
existing = list(
|
||||
(await session.execute(select(UserCustomPromptRow).where(UserCustomPromptRow.user_id == user_id, UserCustomPromptRow.origin == "position"))).scalars()
|
||||
)
|
||||
existing_by_template = {r.template_id: r for r in existing if r.template_id}
|
||||
now = datetime.now(UTC)
|
||||
# Remove stale clones (template no longer granted or template deleted).
|
||||
for tpl_id, row in existing_by_template.items():
|
||||
if tpl_id not in templates:
|
||||
await session.delete(row)
|
||||
# Add / refresh clones for granted templates.
|
||||
for tpl_id, tpl in templates.items():
|
||||
row = existing_by_template.get(tpl_id)
|
||||
if row is None:
|
||||
session.add(
|
||||
UserCustomPromptRow(
|
||||
id=uuid.uuid4().hex,
|
||||
user_id=user_id,
|
||||
title=tpl.title,
|
||||
content=tpl.content,
|
||||
sort_order=tpl.sort_order,
|
||||
agent_id=tpl.agent_id,
|
||||
is_template=False,
|
||||
origin="position",
|
||||
template_id=tpl_id,
|
||||
position_id=position_id,
|
||||
created_at=now,
|
||||
updated_at=now,
|
||||
)
|
||||
)
|
||||
else:
|
||||
# Keep the user's clone in step with the template content.
|
||||
row.title = tpl.title
|
||||
row.content = tpl.content
|
||||
row.agent_id = tpl.agent_id
|
||||
row.position_id = position_id
|
||||
row.updated_at = now
|
||||
|
||||
# ------------------------------------------------------------- fan-out
|
||||
|
||||
async def sync_position(self, position_id: str) -> int:
|
||||
"""Re-sync every member of a position. Returns the member count."""
|
||||
member_ids = await self._positions.list_member_ids(position_id)
|
||||
for uid in member_ids:
|
||||
try:
|
||||
await self.sync_user(uid)
|
||||
except Exception:
|
||||
logger.exception("position sync failed for user %s (position %s)", uid, position_id)
|
||||
return len(member_ids)
|
||||
|
||||
async def sync_default_members(self) -> int:
|
||||
"""Re-sync users with NO explicit position (they inherit the default)."""
|
||||
default_id = await self._positions.get_default_position_id()
|
||||
if not default_id:
|
||||
return 0
|
||||
assigned = set(await self._positions.list_assigned_user_ids())
|
||||
count = 0
|
||||
if self._sf is None:
|
||||
return 0
|
||||
from deerflow.persistence.user.model import UserRow
|
||||
|
||||
async with self._sf() as session:
|
||||
all_ids = [uid for (uid,) in (await session.execute(select(UserRow.id))).all()]
|
||||
for uid in all_ids:
|
||||
if uid in assigned:
|
||||
continue
|
||||
try:
|
||||
await self.sync_user(uid)
|
||||
count += 1
|
||||
except Exception:
|
||||
logger.exception("default position sync failed for user %s", uid)
|
||||
return count
|
||||
Reference in new issue
Block a user