页面嵌套修改
This commit is contained in:
1 parent
213dd841b5
commit
4450f342d8
38 files changed
+2020
-309
No files matched your search
+45
@@ -0,0 +1,45 @@
|
||||
"""Add configurable position-roundtable roles.
|
||||
|
||||
Revision ID: 20260729_01
|
||||
Revises: 20260723_05
|
||||
Create Date: 2026-07-29
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import sqlalchemy as sa
|
||||
from alembic import op
|
||||
from sqlalchemy import inspect
|
||||
|
||||
revision = "20260729_01"
|
||||
down_revision = "20260723_05"
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
|
||||
def _has_table(name: str) -> bool:
|
||||
return name in inspect(op.get_bind()).get_table_names()
|
||||
|
||||
|
||||
def upgrade() -> None:
|
||||
if _has_table("position_roles"):
|
||||
return
|
||||
op.create_table(
|
||||
"position_roles",
|
||||
sa.Column("id", sa.String(length=128), primary_key=True),
|
||||
sa.Column("name", sa.String(length=128), nullable=False, unique=True),
|
||||
sa.Column("description", sa.String(length=512), nullable=False, server_default=""),
|
||||
sa.Column("role_type", sa.String(length=32), nullable=False, server_default="standard"),
|
||||
sa.Column("enabled", sa.Boolean(), nullable=False, server_default=sa.true()),
|
||||
sa.Column("is_builtin", sa.Boolean(), nullable=False, server_default=sa.false()),
|
||||
sa.Column("sort_order", sa.Integer(), nullable=False, server_default="0"),
|
||||
sa.Column("updated_by", sa.String(length=64), nullable=True),
|
||||
sa.Column("updated_at", sa.DateTime(timezone=True), nullable=False),
|
||||
)
|
||||
op.create_index("ix_position_roles_name", "position_roles", ["name"])
|
||||
op.create_index("ix_position_roles_role_type", "position_roles", ["role_type"])
|
||||
|
||||
|
||||
def downgrade() -> None:
|
||||
if _has_table("position_roles"):
|
||||
op.drop_table("position_roles")
|
||||
+20
-18
@@ -15,18 +15,6 @@ its storage implementation lives in ``deerflow.runtime.events.store.db`` and
|
||||
there is no matching entity directory.
|
||||
"""
|
||||
|
||||
from deerflow.persistence.agents.model import (
|
||||
AgentExtrasRow,
|
||||
AgentFavoriteRow,
|
||||
AgentRow,
|
||||
AgentSkillRow,
|
||||
)
|
||||
from deerflow.persistence.admin_stats.model import AdminLeaderboardDailyStatRow
|
||||
from deerflow.persistence.business_mapping.model import BusinessMappingRow
|
||||
from deerflow.persistence.concurrency.model import ConcurrencySampleRow
|
||||
from deerflow.persistence.dashboard_sessions.model import DashboardSessionRow
|
||||
from deerflow.persistence.memory_config.model import UserMemoryConfigRow
|
||||
from deerflow.persistence.feedback.model import FeedbackRow
|
||||
from deerflow.knowledge.models import (
|
||||
KnowledgeEmbeddingRow,
|
||||
KnowledgeEntityRow,
|
||||
@@ -40,12 +28,26 @@ from deerflow.knowledge.models import (
|
||||
KnowledgeSourceRow,
|
||||
KnowledgeTagRow,
|
||||
)
|
||||
from deerflow.persistence.admin_stats.model import AdminLeaderboardDailyStatRow
|
||||
from deerflow.persistence.agents.model import (
|
||||
AgentExtrasRow,
|
||||
AgentFavoriteRow,
|
||||
AgentRow,
|
||||
AgentSkillRow,
|
||||
)
|
||||
from deerflow.persistence.business_mapping.model import BusinessMappingRow
|
||||
from deerflow.persistence.concurrency.model import ConcurrencySampleRow
|
||||
from deerflow.persistence.dashboard_sessions.model import DashboardSessionRow
|
||||
from deerflow.persistence.embed_sessions.model import EmbedSessionRow
|
||||
from deerflow.persistence.feedback.model import FeedbackRow
|
||||
from deerflow.persistence.light_apps.model import LightAppRow
|
||||
from deerflow.persistence.llm_metrics.model import LlmCallMetricRow
|
||||
from deerflow.persistence.memory_config.model import UserMemoryConfigRow
|
||||
from deerflow.persistence.menu_overrides.model import MenuOverrideRow
|
||||
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.position_roles.model import PositionRoleRow
|
||||
from deerflow.persistence.position_roundtable.model import (
|
||||
PositionRoundtableNodeRow,
|
||||
PositionRoundtableSessionRow,
|
||||
@@ -54,16 +56,15 @@ from deerflow.persistence.positions.model import PositionRow, PositionTagBinding
|
||||
from deerflow.persistence.recommended_questions.model import RecommendedQuestionRow
|
||||
from deerflow.persistence.research_templates.model import ResearchTemplateRow
|
||||
from deerflow.persistence.roundtable_chains.model import RoundtableChainRow
|
||||
from deerflow.persistence.roundtable_diagnostics.model import RoundtableDiagnosticRow
|
||||
from deerflow.persistence.roundtable_draft_shares.model import RoundtableDraftShareRow
|
||||
from deerflow.persistence.roundtable_drafts.model import (
|
||||
RoundtableDraftRow,
|
||||
RoundtableRecommendHistoryRow,
|
||||
)
|
||||
from deerflow.persistence.roundtable_diagnostics.model import RoundtableDiagnosticRow
|
||||
from deerflow.persistence.roundtable_jobs.model import RoundtableJobRow
|
||||
from deerflow.persistence.roundtable_task_drafts.model import RoundtableTaskDraftRow
|
||||
from deerflow.persistence.run.model import RunRow
|
||||
from deerflow.persistence.sensitive_words.model import SensitiveWordRow
|
||||
from deerflow.persistence.scheduled_tasks.model import (
|
||||
ScheduledTaskDeliveryProfileRow,
|
||||
ScheduledTaskRow,
|
||||
@@ -71,13 +72,13 @@ from deerflow.persistence.scheduled_tasks.model import (
|
||||
ScheduledTaskSubscriptionRow,
|
||||
SchedulerThreadRow,
|
||||
)
|
||||
from deerflow.persistence.sensitive_words.model import SensitiveWordRow
|
||||
from deerflow.persistence.skills.model import SkillDisplayAdapterRow, SkillFavoriteRow, SkillRow
|
||||
from deerflow.persistence.task_buttons.model import TaskButtonRow
|
||||
from deerflow.persistence.taskcop_tasks.model import TaskCopTaskRow
|
||||
from deerflow.persistence.task_reports.model import TaskReportRow
|
||||
from deerflow.persistence.tags.model import TagAssignmentRow, TagRow
|
||||
from deerflow.persistence.task_buttons.model import TaskButtonRow
|
||||
from deerflow.persistence.task_reports.model import TaskReportRow
|
||||
from deerflow.persistence.taskcop_tasks.model import TaskCopTaskRow
|
||||
from deerflow.persistence.thread_meta.model import ThreadMetaRow
|
||||
from deerflow.persistence.embed_sessions.model import EmbedSessionRow
|
||||
from deerflow.persistence.thread_shares.model import ThreadShareRow
|
||||
from deerflow.persistence.tool_metrics.model import ToolCallMetricRow
|
||||
from deerflow.persistence.user.model import UserRow
|
||||
@@ -123,6 +124,7 @@ __all__ = [
|
||||
"RoundtableJobRow",
|
||||
"RoundtableRecommendHistoryRow",
|
||||
"RoundtableTaskDraftRow",
|
||||
"PositionRoleRow",
|
||||
"RunEventRow",
|
||||
"RunRow",
|
||||
"ScheduledTaskDeliveryProfileRow",
|
||||
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
"""Position-roundtable role configuration persistence.
|
||||
|
||||
This is deliberately separate from :mod:`deerflow.persistence.positions`.
|
||||
The latter represents organisational positions and resource grants, while this
|
||||
package describes the work views used inside the position-roundtable product.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from deerflow.persistence.position_roles.base import PositionRoleStore
|
||||
from deerflow.persistence.position_roles.memory import MemoryPositionRoleStore
|
||||
from deerflow.persistence.position_roles.model import PositionRoleRow
|
||||
from deerflow.persistence.position_roles.sql import PositionRoleRepository
|
||||
|
||||
__all__ = [
|
||||
"MemoryPositionRoleStore",
|
||||
"PositionRoleRepository",
|
||||
"PositionRoleRow",
|
||||
"PositionRoleStore",
|
||||
"make_position_role_store",
|
||||
]
|
||||
|
||||
|
||||
def make_position_role_store(session_factory):
|
||||
if session_factory is None:
|
||||
return MemoryPositionRoleStore()
|
||||
return PositionRoleRepository(session_factory)
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
"""Abstract storage for position-roundtable role configuration."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from abc import ABC, abstractmethod
|
||||
from typing import Any
|
||||
|
||||
|
||||
class PositionRoleStore(ABC):
|
||||
"""Global configuration shared by every position-roundtable session."""
|
||||
|
||||
@abstractmethod
|
||||
async def list_roles(self) -> list[dict[str, Any]]:
|
||||
"""Return roles in presentation order."""
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def replace_all(
|
||||
self,
|
||||
rows: list[dict[str, Any]],
|
||||
*,
|
||||
updated_by: str | None = None,
|
||||
) -> list[dict[str, Any]]:
|
||||
"""Atomically replace the editable role directory."""
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def ensure_seed(self, rows: list[dict[str, Any]]) -> list[dict[str, Any]]:
|
||||
"""Insert only missing built-in roles, without overwriting edits."""
|
||||
raise NotImplementedError
|
||||
+45
@@ -0,0 +1,45 @@
|
||||
"""In-memory fallback for position-roundtable role configuration."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import UTC, datetime
|
||||
from typing import Any
|
||||
|
||||
from deerflow.persistence.position_roles.base import PositionRoleStore
|
||||
|
||||
|
||||
def _normalize(row: dict[str, Any], updated_by: str | None = None) -> dict[str, Any]:
|
||||
return {
|
||||
"id": str(row["id"]),
|
||||
"name": str(row.get("name") or ""),
|
||||
"description": str(row.get("description") or ""),
|
||||
"role_type": str(row.get("role_type") or "standard"),
|
||||
"enabled": bool(row.get("enabled", True)),
|
||||
"is_builtin": bool(row.get("is_builtin", False)),
|
||||
"sort_order": int(row.get("sort_order", 0)),
|
||||
"updated_by": updated_by,
|
||||
"updated_at": datetime.now(UTC).isoformat(),
|
||||
}
|
||||
|
||||
|
||||
class MemoryPositionRoleStore(PositionRoleStore):
|
||||
def __init__(self) -> None:
|
||||
self._rows: dict[str, dict[str, Any]] = {}
|
||||
|
||||
async def list_roles(self) -> list[dict[str, Any]]:
|
||||
return [dict(row) for row in sorted(self._rows.values(), key=lambda item: (item["sort_order"], item["id"]))]
|
||||
|
||||
async def replace_all(self, rows: list[dict[str, Any]], *, updated_by: str | None = None) -> list[dict[str, Any]]:
|
||||
self._rows = {
|
||||
str(row["id"]): _normalize(row, updated_by)
|
||||
for row in rows
|
||||
if row.get("id")
|
||||
}
|
||||
return await self.list_roles()
|
||||
|
||||
async def ensure_seed(self, rows: list[dict[str, Any]]) -> list[dict[str, Any]]:
|
||||
for row in rows:
|
||||
row_id = str(row.get("id") or "")
|
||||
if row_id and row_id not in self._rows:
|
||||
self._rows[row_id] = _normalize(row)
|
||||
return await self.list_roles()
|
||||
+37
@@ -0,0 +1,37 @@
|
||||
"""ORM model for configurable position-roundtable roles."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import UTC, datetime
|
||||
|
||||
from sqlalchemy import Boolean, Integer, String
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from deerflow.persistence.base import Base
|
||||
from deerflow.persistence.types import BeijingDateTime
|
||||
|
||||
|
||||
class PositionRoleRow(Base):
|
||||
"""A work-view role in the position-roundtable product.
|
||||
|
||||
``role_type`` is intentionally small and stable: ``standard`` denotes a
|
||||
normal business-chain position; ``intent`` denotes the single special
|
||||
position responsible for initial intent identification and closing-agent
|
||||
entry. It is a configuration concern, not an organisation/RBAC position.
|
||||
"""
|
||||
|
||||
__tablename__ = "position_roles"
|
||||
|
||||
id: Mapped[str] = mapped_column(String(128), primary_key=True)
|
||||
name: Mapped[str] = mapped_column(String(128), unique=True, index=True)
|
||||
description: Mapped[str] = mapped_column(String(512), default="")
|
||||
role_type: Mapped[str] = mapped_column(String(32), default="standard", index=True)
|
||||
enabled: Mapped[bool] = mapped_column(Boolean, default=True)
|
||||
is_builtin: Mapped[bool] = mapped_column(Boolean, default=False, server_default="0")
|
||||
sort_order: Mapped[int] = mapped_column(Integer, default=0)
|
||||
updated_by: Mapped[str | None] = mapped_column(String(64))
|
||||
updated_at: Mapped[datetime] = mapped_column(
|
||||
BeijingDateTime(),
|
||||
default=lambda: datetime.now(UTC),
|
||||
onupdate=lambda: datetime.now(UTC),
|
||||
)
|
||||
+66
@@ -0,0 +1,66 @@
|
||||
"""SQLAlchemy storage for position-roundtable role configuration."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import datetime
|
||||
from typing import Any
|
||||
|
||||
from sqlalchemy import delete, select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
|
||||
|
||||
from deerflow.persistence.position_roles.base import PositionRoleStore
|
||||
from deerflow.persistence.position_roles.model import PositionRoleRow
|
||||
|
||||
|
||||
def _to_dict(row: PositionRoleRow) -> dict[str, Any]:
|
||||
data = row.to_dict()
|
||||
if isinstance(data.get("updated_at"), datetime):
|
||||
data["updated_at"] = data["updated_at"].isoformat()
|
||||
return data
|
||||
|
||||
|
||||
def _row_from(data: dict[str, Any], updated_by: str | None = None) -> PositionRoleRow:
|
||||
return PositionRoleRow(
|
||||
id=str(data["id"]),
|
||||
name=str(data.get("name") or ""),
|
||||
description=str(data.get("description") or ""),
|
||||
role_type=str(data.get("role_type") or "standard"),
|
||||
enabled=bool(data.get("enabled", True)),
|
||||
is_builtin=bool(data.get("is_builtin", False)),
|
||||
sort_order=int(data.get("sort_order", 0)),
|
||||
updated_by=updated_by,
|
||||
)
|
||||
|
||||
|
||||
class PositionRoleRepository(PositionRoleStore):
|
||||
def __init__(self, session_factory: async_sessionmaker[AsyncSession]) -> None:
|
||||
self._sf = session_factory
|
||||
|
||||
async def list_roles(self) -> list[dict[str, Any]]:
|
||||
statement = select(PositionRoleRow).order_by(PositionRoleRow.sort_order.asc(), PositionRoleRow.id.asc())
|
||||
async with self._sf() as session:
|
||||
rows = (await session.execute(statement)).scalars()
|
||||
return [_to_dict(row) for row in rows]
|
||||
|
||||
async def replace_all(self, rows: list[dict[str, Any]], *, updated_by: str | None = None) -> list[dict[str, Any]]:
|
||||
# Keep the final occurrence of duplicate ids so malformed UI payloads
|
||||
# cannot violate the primary-key constraint.
|
||||
by_id = {str(row["id"]): row for row in rows if row.get("id")}
|
||||
async with self._sf() as session:
|
||||
await session.execute(delete(PositionRoleRow))
|
||||
created = [_row_from(row, updated_by) for row in by_id.values()]
|
||||
session.add_all(created)
|
||||
await session.commit()
|
||||
for row in created:
|
||||
await session.refresh(row)
|
||||
return [_to_dict(row) for row in sorted(created, key=lambda item: (item.sort_order, item.id))]
|
||||
|
||||
async def ensure_seed(self, rows: list[dict[str, Any]]) -> list[dict[str, Any]]:
|
||||
"""Idempotently insert new built-ins without changing operator edits."""
|
||||
async with self._sf() as session:
|
||||
existing_ids = set((await session.execute(select(PositionRoleRow.id))).scalars())
|
||||
inserts = [_row_from(row) for row in rows if row.get("id") and str(row["id"]) not in existing_ids]
|
||||
if inserts:
|
||||
session.add_all(inserts)
|
||||
await session.commit()
|
||||
return await self.list_roles()
|
||||
Reference in new issue
Block a user