sync update from LAN repo (source master @ c21a2a4a)
This commit is contained in:
1 parent
ea9dcff9c0
commit
66a443e915
140 files changed
+13777
-1040
No files matched your search
+18
-1
@@ -23,7 +23,7 @@ from deerflow.config.agents_config import AGENT_ID_PATTERN, load_agent_config, l
|
||||
from deerflow.config.paths import get_paths
|
||||
from deerflow.persistence.scheduled_tasks import ScheduledTaskStore
|
||||
from deerflow.runtime.scheduler import html_page as html_page_utils
|
||||
from deerflow.runtime.scheduler import template_fill
|
||||
from deerflow.runtime.scheduler import template_fill, template_store
|
||||
from deerflow.runtime.scheduler.element import ElementDeliveryClient
|
||||
from deerflow.runtime.serialization import serialize_channel_values
|
||||
from deerflow.runtime.user_context import reset_current_user, set_current_user
|
||||
@@ -1636,6 +1636,10 @@ class ScheduledTaskService:
|
||||
# 不影响 Markdown 生成等其它正常操作。缺省(未存该键的老任务)视为开启:
|
||||
# 模板有真实数据来源后,默认走「智能体检索 → 转换填充」,显式 False 才关闭。
|
||||
extract = cfg.get("template_extract") is not False
|
||||
# 「抽取信息写回模板数据」:开启后转换成功的抽取结果除填充本次产物外,还会
|
||||
# 写回模板的 data.json(默认数据持久化——管理页预览与后续任务即时沿用新数据)。
|
||||
# 只写数据,MANIFEST(系统名称/导航页面等)绝不动;缺省(老任务)视为关闭。
|
||||
writeback = cfg.get("template_data_writeback") is True
|
||||
also_markdown = _task_requires_markdown(task)
|
||||
prompt = str(task.get("prompt") or "").strip()
|
||||
description = str(task.get("description") or "").strip()
|
||||
@@ -1702,8 +1706,21 @@ class ScheduledTaskService:
|
||||
page_title, page_subtitle = template_fill.pop_page_titles(converted)
|
||||
# 子页面没抽到有效内容的,回退模板原有数据,避免子页面空白。
|
||||
data_obj = template_fill.merge_with_reference(tpl_id, converted)
|
||||
# 字段管理里「接受抽取更新」被关闭(锁定)的字段,恢复模板现有值,
|
||||
# 抽取结果不覆盖——对本次产物与(开启时的)数据写回同时生效。
|
||||
data_obj = template_store.restore_locked_fields(tpl_id, data_obj)
|
||||
content = f"已检索数据并套用模板「{spec.name}」(空子页面回退原数据,含全部子页面)"
|
||||
used_default = False
|
||||
if writeback:
|
||||
try:
|
||||
# 抽取结果写回模板默认数据(data.json)——仅数据,MANIFEST/系统
|
||||
# 名称不动;管理页预览与后续任务即时基于更新后的默认数据。
|
||||
template_store.write_template_data(tpl_id, data_obj)
|
||||
content += ";抽取数据已写回模板默认数据"
|
||||
except Exception:
|
||||
logger.warning(
|
||||
"模板数据回写失败(不影响本次产物) run=%s tpl=%s", run_id, tpl_id, exc_info=True
|
||||
)
|
||||
except TemplateFillError:
|
||||
logger.warning("模板参考转换失败,回退默认数据 run=%s tpl=%s", run_id, tpl_id, exc_info=True)
|
||||
data_obj = template_fill.reference_data(tpl_id)
|
||||
|
||||
Reference in new issue
Block a user