From 8d2bc63c49e0e52b6a7dec9e56459ab881429528 Mon Sep 17 00:00:00 2001 From: Archer <545436317@qq.com> Date: Sun, 22 Mar 2026 18:11:50 +0800 Subject: [PATCH] V4.14.9 dev (#6604) * fix: image read and json error (Agent) (#6502) * fix: 1.image read 2.JSON parsing error * dataset cite and pause * perf: plancall second parse * add test --------- Co-authored-by: archer <545436317@qq.com> * master message * deploy --------- Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com> --- deploy/docker/cn/docker-compose.milvus.yml | 3 +-- deploy/docker/cn/docker-compose.oceanbase.yml | 3 +-- deploy/docker/cn/docker-compose.pg.yml | 3 +-- deploy/docker/cn/docker-compose.seekdb.yml | 3 +-- deploy/docker/cn/docker-compose.zilliz.yml | 3 +-- deploy/docker/global/docker-compose.milvus.yml | 3 +-- deploy/docker/global/docker-compose.oceanbase.yml | 3 +-- deploy/docker/global/docker-compose.pg.yml | 3 +-- deploy/docker/global/docker-compose.seekdb.yml | 3 +-- deploy/docker/global/docker-compose.ziliiz.yml | 3 +-- deploy/templates/docker-compose.prod.yml | 3 +-- .../deploy/docker/cn/docker-compose.milvus.yml | 3 +-- .../deploy/docker/cn/docker-compose.oceanbase.yml | 3 +-- .../public/deploy/docker/cn/docker-compose.pg.yml | 3 +-- .../deploy/docker/cn/docker-compose.seekdb.yml | 3 +-- .../deploy/docker/cn/docker-compose.zilliz.yml | 3 +-- .../deploy/docker/global/docker-compose.milvus.yml | 3 +-- .../docker/global/docker-compose.oceanbase.yml | 3 +-- .../deploy/docker/global/docker-compose.pg.yml | 3 +-- .../deploy/docker/global/docker-compose.seekdb.yml | 3 +-- .../deploy/docker/global/docker-compose.ziliiz.yml | 3 +-- .../service/core/workflow/dispatch/ai/agent/index.ts | 12 ++++++++++++ 22 files changed, 33 insertions(+), 42 deletions(-) diff --git a/deploy/docker/cn/docker-compose.milvus.yml b/deploy/docker/cn/docker-compose.milvus.yml index 4912178421..ee13b8f106 100644 --- a/deploy/docker/cn/docker-compose.milvus.yml +++ b/deploy/docker/cn/docker-compose.milvus.yml @@ -202,7 +202,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -235,7 +235,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/deploy/docker/cn/docker-compose.oceanbase.yml b/deploy/docker/cn/docker-compose.oceanbase.yml index 9c1f60c610..da103f49b6 100644 --- a/deploy/docker/cn/docker-compose.oceanbase.yml +++ b/deploy/docker/cn/docker-compose.oceanbase.yml @@ -179,7 +179,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -212,7 +212,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/deploy/docker/cn/docker-compose.pg.yml b/deploy/docker/cn/docker-compose.pg.yml index 1a1432e400..d81052c3b4 100644 --- a/deploy/docker/cn/docker-compose.pg.yml +++ b/deploy/docker/cn/docker-compose.pg.yml @@ -160,7 +160,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -193,7 +193,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/deploy/docker/cn/docker-compose.seekdb.yml b/deploy/docker/cn/docker-compose.seekdb.yml index a2de974c15..e084b996fb 100644 --- a/deploy/docker/cn/docker-compose.seekdb.yml +++ b/deploy/docker/cn/docker-compose.seekdb.yml @@ -166,7 +166,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -199,7 +199,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/deploy/docker/cn/docker-compose.zilliz.yml b/deploy/docker/cn/docker-compose.zilliz.yml index 6928a15c7f..032d8af6f1 100644 --- a/deploy/docker/cn/docker-compose.zilliz.yml +++ b/deploy/docker/cn/docker-compose.zilliz.yml @@ -144,7 +144,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -177,7 +177,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/deploy/docker/global/docker-compose.milvus.yml b/deploy/docker/global/docker-compose.milvus.yml index 876620e014..c772499bd2 100644 --- a/deploy/docker/global/docker-compose.milvus.yml +++ b/deploy/docker/global/docker-compose.milvus.yml @@ -202,7 +202,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -235,7 +235,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/deploy/docker/global/docker-compose.oceanbase.yml b/deploy/docker/global/docker-compose.oceanbase.yml index b5b6042bed..6979c2c87a 100644 --- a/deploy/docker/global/docker-compose.oceanbase.yml +++ b/deploy/docker/global/docker-compose.oceanbase.yml @@ -179,7 +179,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -212,7 +212,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/deploy/docker/global/docker-compose.pg.yml b/deploy/docker/global/docker-compose.pg.yml index 9bcdf4a2d2..2a8a74c734 100644 --- a/deploy/docker/global/docker-compose.pg.yml +++ b/deploy/docker/global/docker-compose.pg.yml @@ -160,7 +160,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -193,7 +193,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/deploy/docker/global/docker-compose.seekdb.yml b/deploy/docker/global/docker-compose.seekdb.yml index 4c75064566..d4ac74c8b1 100644 --- a/deploy/docker/global/docker-compose.seekdb.yml +++ b/deploy/docker/global/docker-compose.seekdb.yml @@ -166,7 +166,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -199,7 +199,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/deploy/docker/global/docker-compose.ziliiz.yml b/deploy/docker/global/docker-compose.ziliiz.yml index 680d9547f2..aab8cd5d87 100644 --- a/deploy/docker/global/docker-compose.ziliiz.yml +++ b/deploy/docker/global/docker-compose.ziliiz.yml @@ -144,7 +144,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -177,7 +177,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/deploy/templates/docker-compose.prod.yml b/deploy/templates/docker-compose.prod.yml index a50a808d28..d87e1469df 100644 --- a/deploy/templates/docker-compose.prod.yml +++ b/deploy/templates/docker-compose.prod.yml @@ -143,7 +143,7 @@ ${{vec.db}} - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -176,7 +176,6 @@ ${{vec.db}} AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/document/public/deploy/docker/cn/docker-compose.milvus.yml b/document/public/deploy/docker/cn/docker-compose.milvus.yml index 4912178421..ee13b8f106 100644 --- a/document/public/deploy/docker/cn/docker-compose.milvus.yml +++ b/document/public/deploy/docker/cn/docker-compose.milvus.yml @@ -202,7 +202,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -235,7 +235,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/document/public/deploy/docker/cn/docker-compose.oceanbase.yml b/document/public/deploy/docker/cn/docker-compose.oceanbase.yml index 9c1f60c610..da103f49b6 100644 --- a/document/public/deploy/docker/cn/docker-compose.oceanbase.yml +++ b/document/public/deploy/docker/cn/docker-compose.oceanbase.yml @@ -179,7 +179,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -212,7 +212,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/document/public/deploy/docker/cn/docker-compose.pg.yml b/document/public/deploy/docker/cn/docker-compose.pg.yml index 1a1432e400..d81052c3b4 100644 --- a/document/public/deploy/docker/cn/docker-compose.pg.yml +++ b/document/public/deploy/docker/cn/docker-compose.pg.yml @@ -160,7 +160,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -193,7 +193,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/document/public/deploy/docker/cn/docker-compose.seekdb.yml b/document/public/deploy/docker/cn/docker-compose.seekdb.yml index a2de974c15..e084b996fb 100644 --- a/document/public/deploy/docker/cn/docker-compose.seekdb.yml +++ b/document/public/deploy/docker/cn/docker-compose.seekdb.yml @@ -166,7 +166,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -199,7 +199,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/document/public/deploy/docker/cn/docker-compose.zilliz.yml b/document/public/deploy/docker/cn/docker-compose.zilliz.yml index 6928a15c7f..032d8af6f1 100644 --- a/document/public/deploy/docker/cn/docker-compose.zilliz.yml +++ b/document/public/deploy/docker/cn/docker-compose.zilliz.yml @@ -144,7 +144,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -177,7 +177,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/document/public/deploy/docker/global/docker-compose.milvus.yml b/document/public/deploy/docker/global/docker-compose.milvus.yml index 876620e014..c772499bd2 100644 --- a/document/public/deploy/docker/global/docker-compose.milvus.yml +++ b/document/public/deploy/docker/global/docker-compose.milvus.yml @@ -202,7 +202,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -235,7 +235,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/document/public/deploy/docker/global/docker-compose.oceanbase.yml b/document/public/deploy/docker/global/docker-compose.oceanbase.yml index b5b6042bed..6979c2c87a 100644 --- a/document/public/deploy/docker/global/docker-compose.oceanbase.yml +++ b/document/public/deploy/docker/global/docker-compose.oceanbase.yml @@ -179,7 +179,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -212,7 +212,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/document/public/deploy/docker/global/docker-compose.pg.yml b/document/public/deploy/docker/global/docker-compose.pg.yml index 9bcdf4a2d2..2a8a74c734 100644 --- a/document/public/deploy/docker/global/docker-compose.pg.yml +++ b/document/public/deploy/docker/global/docker-compose.pg.yml @@ -160,7 +160,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -193,7 +193,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/document/public/deploy/docker/global/docker-compose.seekdb.yml b/document/public/deploy/docker/global/docker-compose.seekdb.yml index 4c75064566..d4ac74c8b1 100644 --- a/document/public/deploy/docker/global/docker-compose.seekdb.yml +++ b/document/public/deploy/docker/global/docker-compose.seekdb.yml @@ -166,7 +166,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -199,7 +199,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/document/public/deploy/docker/global/docker-compose.ziliiz.yml b/document/public/deploy/docker/global/docker-compose.ziliiz.yml index 680d9547f2..aab8cd5d87 100644 --- a/document/public/deploy/docker/global/docker-compose.ziliiz.yml +++ b/document/public/deploy/docker/global/docker-compose.ziliiz.yml @@ -144,7 +144,7 @@ services: - vectorDB restart: always environment: - <<: [*x-share-db-config, *x-vec-config] + <<: [*x-share-db-config, *x-vec-config, *x-log-config] # ==================== 基础配置 ==================== # 前端外部可访问的地址,用于自动补全文件资源路径。例如 https:fastgpt.cn,不能填 localhost。这个值可以不填,不填则发给模型的图片会是一个相对路径,而不是全路径,模型可能伪造Host。 FE_DOMAIN: http://localhost:3000 @@ -177,7 +177,6 @@ services: AIPROXY_API_TOKEN: *x-aiproxy-token # ==================== 日志与监控 ==================== - <<: [*x-log-config] # 传递给 OTLP 收集器的服务名称 LOG_OTEL_SERVICE_NAME: fastgpt-client diff --git a/packages/service/core/workflow/dispatch/ai/agent/index.ts b/packages/service/core/workflow/dispatch/ai/agent/index.ts index a0acdc775a..0f2e5b265c 100644 --- a/packages/service/core/workflow/dispatch/ai/agent/index.ts +++ b/packages/service/core/workflow/dispatch/ai/agent/index.ts @@ -186,6 +186,18 @@ export const dispatchRunAgent = async (props: DispatchAgentModuleProps): Promise } })(); + let masterMessages = (() => { + if (!restoredMasterMessages) { + return historiesMessages.concat(currentUserMessage ? [currentUserMessage] : []); + } else if (planHistoryMessages?.length) { + return restoredMasterMessages ?? historiesMessages; + } else { + return currentUserMessage + ? restoredMasterMessages.concat(currentUserMessage) + : restoredMasterMessages; + } + })(); + // Get sub apps const { completionTools: agentCompletionTools, subAppsMap: agentSubAppsMap } = await getSubapps( {