diff --git a/backend/packages/harness/deerflow/persistence/feedback/model.py b/backend/packages/harness/deerflow/persistence/feedback/model.py index aa19f9a6..07b5f086 100644 --- a/backend/packages/harness/deerflow/persistence/feedback/model.py +++ b/backend/packages/harness/deerflow/persistence/feedback/model.py @@ -4,7 +4,7 @@ from __future__ import annotations from datetime import UTC, datetime -from sqlalchemy import DateTime, String, Text, UniqueConstraint +from sqlalchemy import DateTime, ForeignKey, String, Text, UniqueConstraint from sqlalchemy.orm import Mapped, mapped_column from deerflow.persistence.base import Base @@ -22,6 +22,12 @@ class FeedbackRow(Base): run_id: Mapped[str] = mapped_column(String(64), nullable=False, index=True, comment="关联的运行 ID（runs.run_id）") thread_id: Mapped[str] = mapped_column(String(64), nullable=False, index=True, comment="关联的会话 ID（threads_meta.thread_id）") user_id: Mapped[str | None] = mapped_column(String(64), index=True, comment="反馈作者；为 NULL 表示历史无主数据") + workspace_id: Mapped[str | None] = mapped_column( + String(36), + ForeignKey("workspaces.id", ondelete="CASCADE"), + nullable=True, + comment="所属 workspace；PR5 期间 nullable（回填中），PR5 0003 迁移后改 NOT NULL", + ) message_id: Mapped[str | None] = mapped_column(String(64), comment="可选的 RunEventStore 事件 ID；为 NULL 表示针对整次运行而非单条消息") rating: Mapped[int] = mapped_column(nullable=False, comment="评分：+1 点赞，-1 点踩") comment: Mapped[str | None] = mapped_column(Text, comment="可选的文字评论") diff --git a/backend/packages/harness/deerflow/persistence/models/run_event.py b/backend/packages/harness/deerflow/persistence/models/run_event.py index 63f06b1a..cf74712a 100644 --- a/backend/packages/harness/deerflow/persistence/models/run_event.py +++ b/backend/packages/harness/deerflow/persistence/models/run_event.py @@ -4,7 +4,7 @@ from __future__ import annotations from datetime import UTC, datetime -from sqlalchemy import JSON, DateTime, Index, String, Text, UniqueConstraint +from sqlalchemy import JSON, DateTime, ForeignKey, Index, String, Text, UniqueConstraint from sqlalchemy.orm import Mapped, mapped_column from deerflow.persistence.base import Base @@ -22,6 +22,12 @@ class RunEventRow(Base): index=True, comment="会话所有者；为 NULL 表示鉴权引入之前的历史数据，新写入由 auth 中间件填充，启动期 orphan 迁移会回填存量", ) + workspace_id: Mapped[str | None] = mapped_column( + String(36), + ForeignKey("workspaces.id", ondelete="CASCADE"), + nullable=True, + comment="所属 workspace；PR5 期间 nullable（回填中），PR5 0003 迁移后改 NOT NULL", + ) event_type: Mapped[str] = mapped_column(String(32), nullable=False, comment="事件子类型（具体含义由 category 决定，如 ai_message_chunk、tool_call、run_started）") category: Mapped[str] = mapped_column(String(16), nullable=False, comment='事件大类："message" 消息 / "trace" 追踪 / "lifecycle" 生命周期') content: Mapped[str] = mapped_column(Text, default="", comment="事件文本内容（消息体、错误、状态字符串等）") diff --git a/backend/packages/harness/deerflow/persistence/run/model.py b/backend/packages/harness/deerflow/persistence/run/model.py index 0e86e0a1..3afb3d31 100644 --- a/backend/packages/harness/deerflow/persistence/run/model.py +++ b/backend/packages/harness/deerflow/persistence/run/model.py @@ -4,7 +4,7 @@ from __future__ import annotations from datetime import UTC, datetime -from sqlalchemy import JSON, DateTime, Index, String, Text +from sqlalchemy import JSON, DateTime, ForeignKey, Index, String, Text from sqlalchemy.orm import Mapped, mapped_column from deerflow.persistence.base import Base @@ -17,6 +17,12 @@ class RunRow(Base): thread_id: Mapped[str] = mapped_column(String(64), nullable=False, index=True, comment="所属会话 ID（threads_meta.thread_id）") assistant_id: Mapped[str | None] = mapped_column(String(128), comment="使用的 Assistant ID（自定义智能体名）；为 NULL 表示默认 lead agent") user_id: Mapped[str | None] = mapped_column(String(64), index=True, comment="发起本次运行的用户 ID") + workspace_id: Mapped[str | None] = mapped_column( + String(36), + ForeignKey("workspaces.id", ondelete="CASCADE"), + nullable=True, + comment="所属 workspace；PR5 期间 nullable（回填中），PR5 0003 迁移后改 NOT NULL", + ) status: Mapped[str] = mapped_column( String(20), default="pending", diff --git a/backend/packages/harness/deerflow/persistence/thread_meta/model.py b/backend/packages/harness/deerflow/persistence/thread_meta/model.py index b32db605..cdbd6dda 100644 --- a/backend/packages/harness/deerflow/persistence/thread_meta/model.py +++ b/backend/packages/harness/deerflow/persistence/thread_meta/model.py @@ -4,7 +4,7 @@ from __future__ import annotations from datetime import UTC, datetime -from sqlalchemy import JSON, DateTime, String +from sqlalchemy import JSON, DateTime, ForeignKey, Index, String from sqlalchemy.orm import Mapped, mapped_column from deerflow.persistence.base import Base @@ -16,10 +16,22 @@ class ThreadMetaRow(Base): thread_id: Mapped[str] = mapped_column(String(64), primary_key=True, comment="会话主键（LangGraph thread_id）") assistant_id: Mapped[str | None] = mapped_column(String(128), index=True, comment="关联的 Assistant ID（自定义智能体名）；为 NULL 表示默认 lead agent") user_id: Mapped[str | None] = mapped_column(String(64), index=True, comment="会话所有者；为 NULL 表示历史无主数据") + workspace_id: Mapped[str | None] = mapped_column( + String(36), + ForeignKey("workspaces.id", ondelete="CASCADE"), + nullable=True, + comment="所属 workspace；PR5 期间 nullable（回填中），PR5 0003 迁移后改 NOT NULL", + ) display_name: Mapped[str | None] = mapped_column(String(256), comment="会话显示名（自动生成的标题或用户手改）") status: Mapped[str] = mapped_column(String(20), default="idle", comment='会话状态："idle" 空闲 / "busy" 正在产出') metadata_json: Mapped[dict] = mapped_column(JSON, default=dict, comment="任意扩展元数据（JSON）") created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(UTC), comment="创建时间（UTC）") updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(UTC), onupdate=lambda: datetime.now(UTC), comment="最近更新时间（UTC，写入时自动更新）") - __table_args__ = ({"comment": "会话元数据（每个 LangGraph thread 的概要信息）"},) + __table_args__ = ( + # Workspace-scoped "list threads of this user, newest first" index; + # added by alembic 0002. Mirrored on the ORM side so create_all() + # produces the same shape on fresh dev databases. + Index("idx_threads_meta_workspace_user_updated", "workspace_id", "user_id", "updated_at"), + {"comment": "会话元数据（每个 LangGraph thread 的概要信息）"}, + ) diff --git a/backend/tests/test_alembic_default_workspace_id.py b/backend/tests/test_alembic_default_workspace_id.py index 5c2e6235..84790f3d 100644 --- a/backend/tests/test_alembic_default_workspace_id.py +++ b/backend/tests/test_alembic_default_workspace_id.py @@ -97,7 +97,7 @@ def test_sqlite_upgrade_adds_default_workspace_id_with_fk() -> None: _bootstrap_pre_pr4_schema(sync_url) cfg = _make_alembic_config(async_url) - command.upgrade(cfg, "head") + command.upgrade(cfg, "0001_users_default_workspace") _assert_column_present(sync_url) @@ -112,7 +112,7 @@ def test_sqlite_downgrade_removes_default_workspace_id() -> None: _bootstrap_pre_pr4_schema(sync_url) cfg = _make_alembic_config(async_url) - command.upgrade(cfg, "head") + command.upgrade(cfg, "0001_users_default_workspace") _assert_column_present(sync_url) command.downgrade(cfg, "-1")