日志比较
This commit is contained in:
1 parent
aa3742b103
commit
c555b92089
13 files changed
+1702
-1
No files matched your search
+2
@@ -53,6 +53,7 @@ from deerflow.persistence.maf_roundtable.model import (
|
||||
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.notification_templates.model import NotificationTemplateRow
|
||||
from deerflow.persistence.notifications.model import NotificationRow
|
||||
from deerflow.persistence.parallel_agent_tasks.model import ParallelAgentTaskRow
|
||||
from deerflow.persistence.position_roles.model import PositionRoleRow
|
||||
@@ -124,6 +125,7 @@ __all__ = [
|
||||
"MafRoundtableSessionRow",
|
||||
"MenuOverrideRow",
|
||||
"NotificationRow",
|
||||
"NotificationTemplateRow",
|
||||
"ParallelAgentTaskRow",
|
||||
"PositionRoundtableNodeRow",
|
||||
"PositionRoundtableSessionRow",
|
||||
|
||||
+22
@@ -0,0 +1,22 @@
|
||||
"""Notification template persistence (通知模板管理)."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from deerflow.persistence.notification_templates.base import NotificationTemplateStore
|
||||
from deerflow.persistence.notification_templates.memory import MemoryNotificationTemplateStore
|
||||
from deerflow.persistence.notification_templates.model import NotificationTemplateRow
|
||||
from deerflow.persistence.notification_templates.sql import NotificationTemplateRepository
|
||||
|
||||
__all__ = [
|
||||
"MemoryNotificationTemplateStore",
|
||||
"NotificationTemplateRepository",
|
||||
"NotificationTemplateRow",
|
||||
"NotificationTemplateStore",
|
||||
"make_notification_template_store",
|
||||
]
|
||||
|
||||
|
||||
def make_notification_template_store(session_factory):
|
||||
if session_factory is None:
|
||||
return MemoryNotificationTemplateStore()
|
||||
return NotificationTemplateRepository(session_factory)
|
||||
+46
@@ -0,0 +1,46 @@
|
||||
"""Abstract notification template persistence API."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from abc import ABC, abstractmethod
|
||||
from typing import Any
|
||||
|
||||
|
||||
class NotificationTemplateStore(ABC):
|
||||
@abstractmethod
|
||||
async def list_templates(
|
||||
self,
|
||||
*,
|
||||
keyword: str | None = None,
|
||||
enabled: bool | None = None,
|
||||
tag: str | None = None,
|
||||
page: int = 1,
|
||||
page_size: int = 20,
|
||||
) -> dict[str, Any]:
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def get_template(self, template_id: str) -> dict[str, Any] | None:
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def create_template(self, data: dict[str, Any], *, created_by: str | None = None) -> dict[str, Any]:
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def update_template(
|
||||
self, template_id: str, data: dict[str, Any], *, expected_version: int, updated_by: str | None = None
|
||||
) -> dict[str, Any]:
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def delete_template(self, template_id: str) -> bool:
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def duplicate_template(self, template_id: str, *, created_by: str | None = None) -> dict[str, Any]:
|
||||
raise NotImplementedError
|
||||
|
||||
@abstractmethod
|
||||
async def name_exists(self, name: str, exclude_id: str | None = None) -> bool:
|
||||
raise NotImplementedError
|
||||
+129
@@ -0,0 +1,129 @@
|
||||
"""In-memory notification template store (used when no DB is configured / tests)."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import uuid
|
||||
from datetime import UTC, datetime
|
||||
from typing import Any
|
||||
|
||||
from deerflow.persistence.notification_templates.base import NotificationTemplateStore
|
||||
|
||||
|
||||
def _normalize(data: dict[str, Any], *, created_by: str | None = None, updated_by: str | None = None) -> dict[str, Any]:
|
||||
now = datetime.now(UTC).isoformat()
|
||||
return {
|
||||
"id": str(data.get("id") or uuid.uuid4().hex),
|
||||
"name": str(data["name"]),
|
||||
"title_template": str(data.get("title_template") or ""),
|
||||
"content_template": str(data.get("content_template") or ""),
|
||||
"tags": list(data.get("tags") or []),
|
||||
"enabled": bool(data.get("enabled", True)),
|
||||
"version": int(data.get("version", 1)),
|
||||
"created_by": data.get("created_by") or created_by,
|
||||
"updated_by": updated_by or data.get("updated_by") or created_by,
|
||||
"created_at": data.get("created_at") or now,
|
||||
"updated_at": now,
|
||||
}
|
||||
|
||||
|
||||
class MemoryNotificationTemplateStore(NotificationTemplateStore):
|
||||
def __init__(self) -> None:
|
||||
self._rows: dict[str, dict[str, Any]] = {}
|
||||
|
||||
async def list_templates(
|
||||
self,
|
||||
*,
|
||||
keyword: str | None = None,
|
||||
enabled: bool | None = None,
|
||||
tag: str | None = None,
|
||||
page: int = 1,
|
||||
page_size: int = 20,
|
||||
) -> dict[str, Any]:
|
||||
items = list(self._rows.values())
|
||||
|
||||
if keyword:
|
||||
kw = keyword.lower()
|
||||
items = [
|
||||
r for r in items
|
||||
if kw in r["name"].lower() or kw in r["title_template"].lower() or kw in r["content_template"].lower()
|
||||
]
|
||||
|
||||
if enabled is not None:
|
||||
items = [r for r in items if r["enabled"] == enabled]
|
||||
|
||||
if tag:
|
||||
items = [r for r in items if tag in r.get("tags", [])]
|
||||
|
||||
items.sort(key=lambda r: r.get("created_at", ""), reverse=True)
|
||||
total = len(items)
|
||||
offset = (page - 1) * page_size
|
||||
page_items = items[offset : offset + page_size]
|
||||
|
||||
return {
|
||||
"total": total,
|
||||
"items": [dict(r) for r in page_items],
|
||||
"page": page,
|
||||
"page_size": page_size,
|
||||
}
|
||||
|
||||
async def get_template(self, template_id: str) -> dict[str, Any] | None:
|
||||
row = self._rows.get(template_id)
|
||||
return dict(row) if row else None
|
||||
|
||||
async def create_template(self, data: dict[str, Any], *, created_by: str | None = None) -> dict[str, Any]:
|
||||
row = _normalize(data, created_by=created_by)
|
||||
self._rows[row["id"]] = row
|
||||
return dict(row)
|
||||
|
||||
async def update_template(
|
||||
self, template_id: str, data: dict[str, Any], *, expected_version: int, updated_by: str | None = None
|
||||
) -> dict[str, Any]:
|
||||
row = self._rows.get(template_id)
|
||||
if row is None:
|
||||
raise ValueError("NOT_FOUND")
|
||||
if row["version"] != expected_version:
|
||||
raise ValueError("VERSION_CONFLICT")
|
||||
for key in ("name", "title_template", "content_template", "tags", "enabled"):
|
||||
if key in data:
|
||||
row[key] = data[key]
|
||||
row["version"] = row["version"] + 1
|
||||
row["updated_by"] = updated_by
|
||||
row["updated_at"] = datetime.now(UTC).isoformat()
|
||||
return dict(row)
|
||||
|
||||
async def delete_template(self, template_id: str) -> bool:
|
||||
if template_id in self._rows:
|
||||
del self._rows[template_id]
|
||||
return True
|
||||
return False
|
||||
|
||||
async def duplicate_template(self, template_id: str, *, created_by: str | None = None) -> dict[str, Any]:
|
||||
row = self._rows.get(template_id)
|
||||
if row is None:
|
||||
raise ValueError("NOT_FOUND")
|
||||
base_name = f"{row['name']} - 副本"
|
||||
new_name = base_name
|
||||
counter = 1
|
||||
existing_names = {r["name"] for r in self._rows.values()}
|
||||
while new_name in existing_names:
|
||||
counter += 1
|
||||
new_name = f"{base_name} {counter}"
|
||||
|
||||
new_row = _normalize(
|
||||
{
|
||||
"name": new_name,
|
||||
"title_template": row["title_template"],
|
||||
"content_template": row["content_template"],
|
||||
"tags": list(row.get("tags", [])),
|
||||
"enabled": row["enabled"],
|
||||
},
|
||||
created_by=created_by,
|
||||
)
|
||||
self._rows[new_row["id"]] = new_row
|
||||
return dict(new_row)
|
||||
|
||||
async def name_exists(self, name: str, exclude_id: str | None = None) -> bool:
|
||||
for rid, r in self._rows.items():
|
||||
if r["name"] == name and (exclude_id is None or rid != exclude_id):
|
||||
return True
|
||||
return False
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
"""ORM model for notification templates."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from datetime import UTC, datetime
|
||||
|
||||
from sqlalchemy import Boolean, Integer, String, Text
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from deerflow.persistence.base import Base
|
||||
from deerflow.persistence.types import BeijingDateTime, PortableJSON
|
||||
|
||||
|
||||
class NotificationTemplateRow(Base):
|
||||
__tablename__ = "notification_templates"
|
||||
|
||||
id: Mapped[str] = mapped_column(String(128), primary_key=True)
|
||||
name: Mapped[str] = mapped_column(String(100), unique=True, index=True)
|
||||
title_template: Mapped[str] = mapped_column(String(240), default="")
|
||||
content_template: Mapped[str] = mapped_column(Text, default="")
|
||||
tags: Mapped[list] = mapped_column(PortableJSON(), default=list)
|
||||
enabled: Mapped[bool] = mapped_column(Boolean, default=True)
|
||||
version: Mapped[int] = mapped_column(Integer, default=1)
|
||||
created_by: Mapped[str | None] = mapped_column(String(64))
|
||||
updated_by: Mapped[str | None] = mapped_column(String(64))
|
||||
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)
|
||||
)
|
||||
+203
@@ -0,0 +1,203 @@
|
||||
"""SQLAlchemy-backed notification template store."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import uuid
|
||||
from datetime import datetime
|
||||
from typing import Any
|
||||
|
||||
from sqlalchemy import delete, func, or_, select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
|
||||
|
||||
from deerflow.persistence.notification_templates.base import NotificationTemplateStore
|
||||
from deerflow.persistence.notification_templates.model import NotificationTemplateRow
|
||||
|
||||
|
||||
def _to_dict(row: NotificationTemplateRow) -> 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["tags"] = data.get("tags") or []
|
||||
data["enabled"] = bool(data.get("enabled", True))
|
||||
data["version"] = int(data.get("version", 1))
|
||||
return data
|
||||
|
||||
|
||||
class NotificationTemplateRepository(NotificationTemplateStore):
|
||||
def __init__(self, session_factory: async_sessionmaker[AsyncSession]) -> None:
|
||||
self._sf = session_factory
|
||||
|
||||
async def list_templates(
|
||||
self,
|
||||
*,
|
||||
keyword: str | None = None,
|
||||
enabled: bool | None = None,
|
||||
tag: str | None = None,
|
||||
page: int = 1,
|
||||
page_size: int = 20,
|
||||
) -> dict[str, Any]:
|
||||
stmt = select(NotificationTemplateRow)
|
||||
count_stmt = select(func.count()).select_from(NotificationTemplateRow)
|
||||
|
||||
if keyword:
|
||||
kw = f"%{keyword}%"
|
||||
filt = or_(
|
||||
NotificationTemplateRow.name.ilike(kw),
|
||||
NotificationTemplateRow.title_template.ilike(kw),
|
||||
NotificationTemplateRow.content_template.ilike(kw),
|
||||
)
|
||||
stmt = stmt.where(filt)
|
||||
count_stmt = count_stmt.where(filt)
|
||||
|
||||
if enabled is not None:
|
||||
stmt = stmt.where(NotificationTemplateRow.enabled == enabled)
|
||||
count_stmt = count_stmt.where(NotificationTemplateRow.enabled == enabled)
|
||||
|
||||
if tag:
|
||||
all_rows_stmt = stmt
|
||||
all_rows_count_stmt = count_stmt
|
||||
# Filter by tag in JSON array — load all and filter in Python for portability
|
||||
stmt = select(NotificationTemplateRow)
|
||||
count_stmt = select(func.count()).select_from(NotificationTemplateRow)
|
||||
if keyword:
|
||||
kw = f"%{keyword}%"
|
||||
filt = or_(
|
||||
NotificationTemplateRow.name.ilike(kw),
|
||||
NotificationTemplateRow.title_template.ilike(kw),
|
||||
NotificationTemplateRow.content_template.ilike(kw),
|
||||
)
|
||||
stmt = stmt.where(filt)
|
||||
count_stmt = count_stmt.where(filt)
|
||||
if enabled is not None:
|
||||
stmt = stmt.where(NotificationTemplateRow.enabled == enabled)
|
||||
count_stmt = count_stmt.where(enabled == NotificationTemplateRow.enabled)
|
||||
|
||||
async with self._sf() as session:
|
||||
result = await session.execute(stmt.order_by(NotificationTemplateRow.created_at.desc()))
|
||||
all_rows = list(result.scalars())
|
||||
filtered = [r for r in all_rows if tag in (r.tags or [])]
|
||||
total = len(filtered)
|
||||
offset = (page - 1) * page_size
|
||||
page_rows = filtered[offset : offset + page_size]
|
||||
return {
|
||||
"total": total,
|
||||
"items": [_to_dict(r) for r in page_rows],
|
||||
"page": page,
|
||||
"page_size": page_size,
|
||||
}
|
||||
|
||||
async with self._sf() as session:
|
||||
total_result = await session.execute(count_stmt)
|
||||
total = total_result.scalar() or 0
|
||||
|
||||
offset = (page - 1) * page_size
|
||||
stmt = stmt.order_by(NotificationTemplateRow.created_at.desc()).offset(offset).limit(page_size)
|
||||
result = await session.execute(stmt)
|
||||
rows = list(result.scalars())
|
||||
|
||||
return {
|
||||
"total": total,
|
||||
"items": [_to_dict(r) for r in rows],
|
||||
"page": page,
|
||||
"page_size": page_size,
|
||||
}
|
||||
|
||||
async def get_template(self, template_id: str) -> dict[str, Any] | None:
|
||||
async with self._sf() as session:
|
||||
row = await session.get(NotificationTemplateRow, template_id)
|
||||
return _to_dict(row) if row else None
|
||||
|
||||
async def create_template(self, data: dict[str, Any], *, created_by: str | None = None) -> dict[str, Any]:
|
||||
row = NotificationTemplateRow(
|
||||
id=str(data.get("id") or uuid.uuid4().hex),
|
||||
name=str(data["name"]),
|
||||
title_template=str(data.get("title_template") or ""),
|
||||
content_template=str(data.get("content_template") or ""),
|
||||
tags=list(data.get("tags") or []),
|
||||
enabled=bool(data.get("enabled", True)),
|
||||
version=1,
|
||||
created_by=created_by,
|
||||
updated_by=created_by,
|
||||
)
|
||||
async with self._sf() as session:
|
||||
session.add(row)
|
||||
await session.commit()
|
||||
await session.refresh(row)
|
||||
return _to_dict(row)
|
||||
|
||||
async def update_template(
|
||||
self, template_id: str, data: dict[str, Any], *, expected_version: int, updated_by: str | None = None
|
||||
) -> dict[str, Any]:
|
||||
async with self._sf() as session:
|
||||
row = await session.get(NotificationTemplateRow, template_id)
|
||||
if row is None:
|
||||
raise ValueError("NOT_FOUND")
|
||||
if row.version != expected_version:
|
||||
raise ValueError("VERSION_CONFLICT")
|
||||
if "name" in data:
|
||||
row.name = str(data["name"])
|
||||
if "title_template" in data:
|
||||
row.title_template = str(data["title_template"])
|
||||
if "content_template" in data:
|
||||
row.content_template = str(data["content_template"])
|
||||
if "tags" in data:
|
||||
row.tags = list(data["tags"])
|
||||
if "enabled" in data:
|
||||
row.enabled = bool(data["enabled"])
|
||||
row.version = row.version + 1
|
||||
row.updated_by = updated_by
|
||||
await session.commit()
|
||||
await session.refresh(row)
|
||||
return _to_dict(row)
|
||||
|
||||
async def delete_template(self, template_id: str) -> bool:
|
||||
async with self._sf() as session:
|
||||
row = await session.get(NotificationTemplateRow, template_id)
|
||||
if row is None:
|
||||
return False
|
||||
await session.delete(row)
|
||||
await session.commit()
|
||||
return True
|
||||
|
||||
async def duplicate_template(self, template_id: str, *, created_by: str | None = None) -> dict[str, Any]:
|
||||
async with self._sf() as session:
|
||||
row = await session.get(NotificationTemplateRow, template_id)
|
||||
if row is None:
|
||||
raise ValueError("NOT_FOUND")
|
||||
base_name = f"{row.name} - 副本"
|
||||
new_name = base_name
|
||||
counter = 1
|
||||
while True:
|
||||
existing = await session.execute(
|
||||
select(NotificationTemplateRow).where(NotificationTemplateRow.name == new_name)
|
||||
)
|
||||
if existing.scalar_one_or_none() is None:
|
||||
break
|
||||
counter += 1
|
||||
new_name = f"{base_name} {counter}"
|
||||
|
||||
new_row = NotificationTemplateRow(
|
||||
id=uuid.uuid4().hex,
|
||||
name=new_name,
|
||||
title_template=row.title_template,
|
||||
content_template=row.content_template,
|
||||
tags=list(row.tags or []),
|
||||
enabled=row.enabled,
|
||||
version=1,
|
||||
created_by=created_by,
|
||||
updated_by=created_by,
|
||||
)
|
||||
session.add(new_row)
|
||||
await session.commit()
|
||||
await session.refresh(new_row)
|
||||
return _to_dict(new_row)
|
||||
|
||||
async def name_exists(self, name: str, exclude_id: str | None = None) -> bool:
|
||||
async with self._sf() as session:
|
||||
stmt = select(NotificationTemplateRow).where(NotificationTemplateRow.name == name)
|
||||
if exclude_id:
|
||||
stmt = stmt.where(NotificationTemplateRow.id != exclude_id)
|
||||
result = await session.execute(stmt)
|
||||
return result.scalar_one_or_none() is not None
|
||||
Reference in new issue
Block a user