Merge branch 'dhk-1' of http://192.168.0.200/knowledge-base-bj/deerflow-server into dhk-1
# Conflicts: # frontend-web/src/roundtable-planning/hooks/useStep3Dashboard.ts
This commit is contained in:
commit
b04b830039
20 files changed
+1396
-271
No files matched your search
+18
@@ -0,0 +1,18 @@
|
||||
"""大屏绘制智能体 session persistence (按 taskId 存取,不分权)."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from deerflow.persistence.dashboard_sessions.model import DashboardSessionRow
|
||||
from deerflow.persistence.dashboard_sessions.sql import DashboardSessionRepository
|
||||
|
||||
__all__ = [
|
||||
"DashboardSessionRepository",
|
||||
"DashboardSessionRow",
|
||||
"make_dashboard_session_store",
|
||||
]
|
||||
|
||||
|
||||
def make_dashboard_session_store(session_factory):
|
||||
if session_factory is None:
|
||||
return None
|
||||
return DashboardSessionRepository(session_factory)
|
||||
+49
@@ -0,0 +1,49 @@
|
||||
"""ORM model for the standalone 大屏绘制智能体 session (按 taskId 存取).
|
||||
|
||||
One row per external ``task_id`` — the standalone dashboard page persists its
|
||||
chat transcript + the latest structured ``report_json`` so that returning to the
|
||||
same task either shows the finished dashboard directly (valid report_json) or
|
||||
restores the generation process.
|
||||
|
||||
**Global / shared by task** — like ``roundtable_drafts`` task-bound drafts, the
|
||||
store keys on ``task_id`` and does **not** scope by ``user_id`` (open read +
|
||||
shared writes). ``user_id`` is recorded for audit only.
|
||||
|
||||
``transcript`` / ``report_json`` are large JSON blobs (chat history + report
|
||||
data) stored as serialized strings in ``PortableLongText`` (MySQL ``LONGTEXT``)
|
||||
to dodge MySQL's 64 KB ``TEXT`` cap — same approach as ``roundtable_drafts``.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import UTC, datetime
|
||||
|
||||
from sqlalchemy import String, UniqueConstraint
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from deerflow.persistence.base import Base
|
||||
from deerflow.persistence.types import BeijingDateTime, PortableLongText
|
||||
|
||||
|
||||
class DashboardSessionRow(Base):
|
||||
__tablename__ = "dashboard_sessions"
|
||||
# One session per task — keep it unique so upsert-by-task is unambiguous.
|
||||
__table_args__ = (UniqueConstraint("task_id", name="uq_dashboard_sessions_task_id"),)
|
||||
|
||||
id: Mapped[str] = mapped_column(String(64), primary_key=True)
|
||||
# External task id (deep-link). The session is shared by task, not by user.
|
||||
task_id: Mapped[str] = mapped_column(String(128), nullable=False, index=True)
|
||||
# Audit only — who last wrote. Never used for access control.
|
||||
user_id: Mapped[str | None] = mapped_column(String(64), nullable=True)
|
||||
# Chat transcript JSON (the dashboard agent's dialogue bubbles).
|
||||
transcript: Mapped[str | None] = mapped_column(PortableLongText, nullable=True)
|
||||
# Latest structured dashboard data (report-json string). Presence of a
|
||||
# parseable value = "有效结果" → the page shows the dashboard directly.
|
||||
report_json: Mapped[str | None] = mapped_column(PortableLongText, nullable=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),
|
||||
)
|
||||
+104
@@ -0,0 +1,104 @@
|
||||
"""SQLAlchemy-backed 大屏绘制智能体 session store (按 taskId,不分权).
|
||||
|
||||
``transcript`` / ``report_json`` are JSON serialized into ``PortableLongText``
|
||||
and round-tripped here with ``json.dumps`` / ``json.loads`` — same approach as
|
||||
``roundtable_drafts``. All access keys on ``task_id`` and ignores ``user_id``
|
||||
(open read + shared writes); ``user_id`` is recorded for audit only.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import json
|
||||
from datetime import UTC, datetime
|
||||
from typing import Any
|
||||
from uuid import uuid4
|
||||
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
|
||||
|
||||
from deerflow.persistence.dashboard_sessions.model import DashboardSessionRow
|
||||
|
||||
|
||||
def _loads(value: Any) -> Any:
|
||||
if not isinstance(value, str):
|
||||
return value
|
||||
if not value:
|
||||
return None
|
||||
try:
|
||||
return json.loads(value)
|
||||
except Exception:
|
||||
return None
|
||||
|
||||
|
||||
def _dumps(value: Any) -> str | None:
|
||||
if value is None:
|
||||
return None
|
||||
if isinstance(value, str):
|
||||
return value # already a JSON string (report_json) — store verbatim
|
||||
return json.dumps(value, ensure_ascii=False)
|
||||
|
||||
|
||||
class DashboardSessionRepository:
|
||||
def __init__(self, session_factory: async_sessionmaker[AsyncSession]) -> None:
|
||||
self._sf = session_factory
|
||||
|
||||
@staticmethod
|
||||
def _to_dict(row: DashboardSessionRow) -> dict[str, Any]:
|
||||
return {
|
||||
"id": row.id,
|
||||
"task_id": row.task_id,
|
||||
"user_id": row.user_id,
|
||||
"transcript": _loads(row.transcript),
|
||||
# report_json is a structured-data JSON string; return it as a string
|
||||
# so the frontend parses it with the same robust parser it uses live.
|
||||
"report_json": row.report_json,
|
||||
"created_at": row.created_at.isoformat() if isinstance(row.created_at, datetime) else row.created_at,
|
||||
"updated_at": row.updated_at.isoformat() if isinstance(row.updated_at, datetime) else row.updated_at,
|
||||
}
|
||||
|
||||
async def get_by_task(self, task_id: str) -> dict[str, Any] | None:
|
||||
"""取该 task 的会话(**忽略 user_id**,不分权)。无则 None。"""
|
||||
stmt = select(DashboardSessionRow).where(DashboardSessionRow.task_id == task_id).limit(1)
|
||||
async with self._sf() as session:
|
||||
result = await session.execute(stmt)
|
||||
row = result.scalars().first()
|
||||
return self._to_dict(row) if row is not None else None
|
||||
|
||||
async def upsert_by_task(
|
||||
self,
|
||||
task_id: str,
|
||||
*,
|
||||
transcript: Any = None,
|
||||
report_json: Any = None,
|
||||
user_id: str | None = None,
|
||||
) -> dict[str, Any]:
|
||||
"""按 task_id upsert:无则建、有则更新(**不分权**)。
|
||||
|
||||
``transcript`` / ``report_json`` 仅在传入非 None 时覆盖,便于只更新其中一项。
|
||||
"""
|
||||
now = datetime.now(UTC)
|
||||
async with self._sf() as session:
|
||||
stmt = select(DashboardSessionRow).where(DashboardSessionRow.task_id == task_id).limit(1)
|
||||
row = (await session.execute(stmt)).scalars().first()
|
||||
if row is None:
|
||||
row = DashboardSessionRow(
|
||||
id=uuid4().hex,
|
||||
task_id=task_id,
|
||||
user_id=user_id,
|
||||
transcript=_dumps(transcript),
|
||||
report_json=_dumps(report_json),
|
||||
created_at=now,
|
||||
updated_at=now,
|
||||
)
|
||||
session.add(row)
|
||||
else:
|
||||
if transcript is not None:
|
||||
row.transcript = _dumps(transcript)
|
||||
if report_json is not None:
|
||||
row.report_json = _dumps(report_json)
|
||||
if user_id is not None:
|
||||
row.user_id = user_id
|
||||
row.updated_at = now
|
||||
await session.commit()
|
||||
await session.refresh(row)
|
||||
return self._to_dict(row)
|
||||
+2
@@ -23,6 +23,7 @@ from deerflow.persistence.agents.model import (
|
||||
)
|
||||
from deerflow.persistence.admin_stats.model import AdminLeaderboardDailyStatRow
|
||||
from deerflow.persistence.business_mapping.model import BusinessMappingRow
|
||||
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 (
|
||||
@@ -82,6 +83,7 @@ __all__ = [
|
||||
"AgentSkillRow",
|
||||
"AdminLeaderboardDailyStatRow",
|
||||
"BusinessMappingRow",
|
||||
"DashboardSessionRow",
|
||||
"KnowledgeEmbeddingRow",
|
||||
"KnowledgeEntityRow",
|
||||
"KnowledgeExtractTemplateRow",
|
||||
|
||||
Reference in new issue
Block a user