sync update from LAN repo (source ji @ 85078a31)
This commit is contained in:
1 parent
5d6627af50
commit
e602d88695
864 files changed
+99150
-6346
No files matched your search
+21
@@ -30,6 +30,18 @@ EXCLUDED_SYSTEM_THREAD_TYPES = frozenset(
|
||||
"deep_research",
|
||||
"writing_setup",
|
||||
"report_structure_setup",
|
||||
"task-analysis",
|
||||
"task-analysis-qa",
|
||||
}
|
||||
)
|
||||
|
||||
# 这些系统线程 id 只存在于编排内部,不进「最近的对话」;loopback 派活必须能跨
|
||||
# 「点击触发的 HTTP 用户」和「绑定 created_by 签发的 JWT」读写,否则会 404 not accessible。
|
||||
SHARED_ACCESS_THREAD_TYPES = frozenset(
|
||||
{
|
||||
"roundtable",
|
||||
"task-analysis",
|
||||
"task-analysis-qa",
|
||||
}
|
||||
)
|
||||
|
||||
@@ -43,6 +55,15 @@ def is_excluded_system_thread(metadata: dict[str, Any] | None) -> bool:
|
||||
return isinstance(thread_type, str) and thread_type in EXCLUDED_SYSTEM_THREAD_TYPES
|
||||
|
||||
|
||||
def is_shared_access_thread(metadata: dict[str, Any] | None) -> bool:
|
||||
"""Return True when any authenticated caller may read/write this thread."""
|
||||
md = metadata or {}
|
||||
if md.get("taskId"):
|
||||
return True
|
||||
thread_type = md.get("thread_type")
|
||||
return isinstance(thread_type, str) and thread_type in SHARED_ACCESS_THREAD_TYPES
|
||||
|
||||
|
||||
class ThreadMetaStore(abc.ABC):
|
||||
@abc.abstractmethod
|
||||
async def create(
|
||||
|
||||
+7
-3
@@ -11,7 +11,11 @@ from typing import Any
|
||||
|
||||
from langgraph.store.base import BaseStore
|
||||
|
||||
from deerflow.persistence.thread_meta.base import ThreadMetaStore, is_excluded_system_thread
|
||||
from deerflow.persistence.thread_meta.base import (
|
||||
ThreadMetaStore,
|
||||
is_excluded_system_thread,
|
||||
is_shared_access_thread,
|
||||
)
|
||||
from deerflow.runtime.user_context import AUTO, _AutoSentinel, resolve_user_id
|
||||
from deerflow.utils.time import coerce_iso, now_iso
|
||||
|
||||
@@ -183,8 +187,8 @@ class MemoryThreadMetaStore(ThreadMetaStore):
|
||||
item = await self._store.aget(THREADS_NS, thread_id)
|
||||
if item is None:
|
||||
return not require_existing
|
||||
# 任务深链对话(metadata.taskId)全局共享、不区分用户:任何登录用户都可读写/续聊。
|
||||
if (item.value.get("metadata") or {}).get("taskId"):
|
||||
# 任务深链 / 圆桌 / 任务分析系统线程:全局共享(与 SQL store 同口径)。
|
||||
if is_shared_access_thread(item.value.get("metadata") or {}):
|
||||
return True
|
||||
record_user_id = item.value.get("user_id")
|
||||
if record_user_id is None:
|
||||
|
||||
+5
-5
@@ -8,7 +8,7 @@ from typing import Any
|
||||
from sqlalchemy import func, select, update
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
|
||||
|
||||
from deerflow.persistence.thread_meta.base import ThreadMetaStore, is_excluded_system_thread
|
||||
from deerflow.persistence.thread_meta.base import ThreadMetaStore, is_excluded_system_thread, is_shared_access_thread
|
||||
from deerflow.persistence.thread_meta.model import ThreadMetaRow
|
||||
from deerflow.runtime.user_context import AUTO, _AutoSentinel, resolve_user_id
|
||||
|
||||
@@ -108,10 +108,10 @@ class ThreadMetaRepository(ThreadMetaStore):
|
||||
md = row.metadata_json or {}
|
||||
# 全局共享、不区分用户(任何登录用户都可读写/续聊):
|
||||
# ① 任务深链对话(metadata.taskId);
|
||||
# ② 圆桌会商系统线程(metadata.thread_type=="roundtable")——其 Step2/Step3
|
||||
# 沙箱产物(md/流程图/报告)需让历史草稿或其他账号打开同一会商时也能查看,
|
||||
# 与任务深链对话一致(线程 id 仅存在于草稿中,不会被无关账号发现)。
|
||||
if md.get("taskId") or md.get("thread_type") == "roundtable":
|
||||
# ② 圆桌 / 任务分析等系统编排线程(thread_type 见 SHARED_ACCESS_THREAD_TYPES)
|
||||
# —— loopback 派活签发的 JWT 可能与建 thread 时 HTTP 上下文用户不是同一人,
|
||||
# 若按属主拦截会把刚建好的总控 thread 打成 404 not accessible。
|
||||
if is_shared_access_thread(md):
|
||||
return True
|
||||
if row.user_id is None:
|
||||
return True
|
||||
|
||||
Reference in new issue
Block a user