fix(agent-v2): simplify agent app config flow

Author: BeautyyuYanli

api/core/app/apps/agent_app/app_generator.py

@@ -9,15 +9,13 @@
 from __future__ import annotations
 
 import contextvars
-import json
 import logging
 import threading
 import uuid
-from collections.abc import Generator, Mapping, Sequence
+from collections.abc import Generator, Mapping
 from typing import Any, Literal
 
 from flask import Flask, current_app
-from pydantic import JsonValue
 from sqlalchemy import and_, or_, select
 
 from clients.agent_backend import AgentBackendRunEventAdapter
@@ -63,13 +61,6 @@ class AgentAppGeneratorError(ValueError):
     """Raised when an Agent App turn cannot be set up."""
 
 
-def _append_prompt_file_mappings(query: str, prompt_file_mappings: Sequence[JsonValue]) -> str:
-    """Append raw request file references to the backend user prompt."""
-    if not prompt_file_mappings:
-        return query
-    return f"{query}\n{json.dumps(list(prompt_file_mappings), ensure_ascii=False)}"
-
-
 class AgentAppGenerator(MessageBasedAppGenerator):
     def generate(
         self,
@@ -88,7 +79,6 @@ def generate(
             raise AgentAppGeneratorError("query is required")
         query = query.replace("\x00", "")
         inputs = args["inputs"]
-        prompt_file_mappings = args.get("files") or []
 
         # Resolve the bound roster Agent + its current Agent Soul snapshot.
         agent, agent_config_id, agent_config_version_kind, agent_soul = self._resolve_agent(
@@ -132,7 +122,6 @@ def generate(
             ),
             query=query,
             files=[],
-            prompt_file_mappings=prompt_file_mappings,
             parent_message_id=(
                 args.get("parent_message_id")
                 if invoke_from not in {InvokeFrom.SERVICE_API, InvokeFrom.OPENAPI}
@@ -366,10 +355,6 @@ def _generate_worker(
                     )
                     if handled:
                         return
-                    query = _append_prompt_file_mappings(
-                        query=query,
-                        prompt_file_mappings=application_generate_entity.prompt_file_mappings,
-                    )
 
                 dify_context = DifyRunContext(
                     tenant_id=app_config.tenant_id,

api/core/app/entities/app_invoke_entities.py

@@ -2,7 +2,7 @@
 from enum import StrEnum
 from typing import TYPE_CHECKING, Any, Literal
 
-from pydantic import BaseModel, ConfigDict, Field, JsonValue, ValidationInfo, field_validator
+from pydantic import BaseModel, ConfigDict, Field, ValidationInfo, field_validator
 
 from constants import UUID_NIL
 from core.app.app_config.entities import EasyUIBasedAppConfig, WorkflowUIBasedAppConfig
@@ -227,17 +227,12 @@ class AgentAppGenerateEntity(ChatAppGenerateEntity):
 
     ``agent_runtime_session_snapshot_id`` carries the runtime session scope
     used to resume or suspend within the same editable config surface.
-
-    ``prompt_file_mappings`` preserves the raw request ``files`` array for the
-    Agent backend prompt. These references are appended to the backend prompt
-    text while the stored chat message keeps the user's original query.
     """
 
     agent_id: str
     agent_config_snapshot_id: str
     agent_config_version_kind: Literal["snapshot", "draft", "build_draft"] = "snapshot"
     agent_runtime_session_snapshot_id: str | None = None
-    prompt_file_mappings: Sequence[JsonValue] = Field(default_factory=list)
 
 
 class AdvancedChatAppGenerateEntity(ConversationAppGenerateEntity):

api/services/agent_config_service.py

@@ -18,16 +18,15 @@
 import zipfile
 from dataclasses import dataclass
 from enum import StrEnum
-from operator import itemgetter
 from typing import Literal
 
+from core.app.file_access.controller import DatabaseFileAccessController
 from dotenv import dotenv_values
 from pydantic import BaseModel, ConfigDict, Field
 from sqlalchemy import select
 from sqlalchemy.exc import DataError, SQLAlchemyError
 from sqlalchemy.orm import Session
 
-from core.app.file_access.controller import DatabaseFileAccessController
 from core.db.session_factory import session_factory
 from core.tools.tool_file_manager import ToolFileManager
 from extensions.ext_storage import storage
@@ -662,9 +661,7 @@ def preview_file(
             file_kind=file_ref.file_kind,
             file_id=file_ref.file_id,
         )
-        return self._preview_bytes(
-            path=filename or file_ref.name, size=file_ref.size, payload=payload, field_name="name"
-        )
+        return self._preview_bytes(path=filename or file_ref.name, size=file_ref.size, payload=payload, field_name="name")
 
     def update_env(
         self,
@@ -1120,14 +1117,8 @@ def _manifest_for_target(target: AgentConfigTarget) -> dict[str, object]:
         return {
             "agent_id": target.agent_id,
             "config_version": AgentConfigService._config_version_payload(target),
-            "skills": {
-                "items": [AgentConfigService._serialize_skill_item(skill) for skill in target.agent_soul.config_skills]
-            },
-            "files": {
-                "items": [
-                    AgentConfigService._serialize_file_item(file_ref) for file_ref in target.agent_soul.config_files
-                ]
-            },
+            "skills": {"items": [AgentConfigService._serialize_skill_item(skill) for skill in target.agent_soul.config_skills]},
+            "files": {"items": [AgentConfigService._serialize_file_item(file_ref) for file_ref in target.agent_soul.config_files]},
             "env_keys": AgentConfigService._env_keys(target.agent_soul),
             "note": target.agent_soul.config_note,
         }
@@ -1196,18 +1187,12 @@ def _preview_bytes(
     def _normalize_archive_member_path(cls, path: str) -> str:
         normalized = path.replace("\\", "/").strip("/")
         if not normalized:
-            raise AgentConfigServiceError(
-                "config_skill_file_invalid", "config skill file path is invalid", status_code=400
-            )
+            raise AgentConfigServiceError("config_skill_file_invalid", "config skill file path is invalid", status_code=400)
         if "\x00" in normalized or any(ord(ch) < 0x20 for ch in normalized):
-            raise AgentConfigServiceError(
-                "config_skill_file_invalid", "config skill file path is invalid", status_code=400
-            )
+            raise AgentConfigServiceError("config_skill_file_invalid", "config skill file path is invalid", status_code=400)
         segments = normalized.split("/")
         if any(not segment or segment in {".", ".."} for segment in segments):
-            raise AgentConfigServiceError(
-                "config_skill_file_invalid", "config skill file path is invalid", status_code=400
-            )
+            raise AgentConfigServiceError("config_skill_file_invalid", "config skill file path is invalid", status_code=400)
         return "/".join(segments)
 
     @classmethod
@@ -1219,7 +1204,8 @@ def _inspect_skill_archive(cls, archive_bytes: bytes) -> tuple[list[dict[str, ob
             for info in archive.infolist():
                 normalized_path = cls._normalize_archive_member_path(info.filename)
                 segments = normalized_path.split("/")
-                directories.update("/".join(segments[:index]) for index in range(1, len(segments)))
+                for index in range(1, len(segments)):
+                    directories.add("/".join(segments[:index]))
                 if info.is_dir():
                     directories.add(normalized_path)
                     continue
@@ -1238,7 +1224,7 @@ def _inspect_skill_archive(cls, archive_bytes: bytes) -> tuple[list[dict[str, ob
             if skill_md_preview is None or skill_md_preview["binary"]:
                 raise ValueError("skill archive is missing a text SKILL.md")
 
-        directory_items: list[dict[str, object]] = [
+        directory_items = [
             {
                 "path": path,
                 "name": path.rsplit("/", 1)[-1],
@@ -1248,7 +1234,7 @@ def _inspect_skill_archive(cls, archive_bytes: bytes) -> tuple[list[dict[str, ob
             }
             for path in sorted(directories)
         ]
-        files = sorted([*directory_items, *members], key=itemgetter("path", "type"))
+        files = sorted([*directory_items, *members], key=lambda item: (item["path"], item["type"]))
         return files, skill_md_preview
 
     def _load_skill_archive_member(self, *, tenant_id: str, file_id: str, path: str) -> bytes:
@@ -1323,9 +1309,7 @@ def _load_file_ref_bytes(
         return storage.load_once(upload_file.key), upload_file.name, upload_file.mime_type
 
     @staticmethod
-    def _resolve_download_url(
-        *, tenant_id: str, file_kind: Literal["upload_file", "tool_file"], file_id: str
-    ) -> str | None:
+    def _resolve_download_url(*, tenant_id: str, file_kind: Literal["upload_file", "tool_file"], file_id: str) -> str | None:
         controller = DatabaseFileAccessController()
         from core.app.workflow.file_runtime import DifyWorkflowFileRuntime
 

api/tasks/app_generate/resume_agent_app_task.py

@@ -51,7 +51,7 @@ def resume_agent_app_execution(*, conversation_id: str, form_id: str) -> None:
             app_model=app_model,
             user=user,
             conversation_id=conversation_id,
-            invoke_from=_resolve_invoke_from(conversation),
+            invoke_from=conversation.invoke_from or InvokeFrom.WEB_APP,
         )
     except Exception:
         logger.exception("Agent App resume failed for conversation %s form %s", conversation_id, form_id)
@@ -68,9 +68,3 @@ def _resolve_conversation_user(*, app_model: App, conversation: Conversation) ->
     if conversation.from_end_user_id:
         return db.session.get(EndUser, conversation.from_end_user_id)
     return None
-
-
-def _resolve_invoke_from(conversation: Conversation) -> InvokeFrom:
-    if conversation.invoke_from is None:
-        return InvokeFrom.WEB_APP
-    return InvokeFrom.value_of(conversation.invoke_from.value)

api/tests/unit_tests/core/app/apps/agent_app/test_app_generator.py

@@ -10,7 +10,6 @@
 from __future__ import annotations
 
 import contextlib
-import json
 
 import pytest
 from pytest_mock import MockerFixture
@@ -98,26 +97,16 @@ def test_generate_orchestrates_and_starts_worker(self, generator, mocker: Mocker
         )
         mocker.patch(f"{MODULE}.ModelConfigConverter.convert", return_value=mocker.MagicMock(model="gpt-4o-mini"))
         mocker.patch(f"{MODULE}.TraceQueueManager", return_value=mocker.MagicMock())
-        generate_entity = mocker.patch(
-            f"{MODULE}.AgentAppGenerateEntity", return_value=mocker.MagicMock(task_id="t", user_id="user")
-        )
+        mocker.patch(f"{MODULE}.AgentAppGenerateEntity", return_value=mocker.MagicMock(task_id="t", user_id="user"))
         mocker.patch(f"{MODULE}.MessageBasedAppQueueManager", return_value=mocker.MagicMock())
         thread_obj = mocker.MagicMock()
         mocker.patch(f"{MODULE}.threading.Thread", return_value=thread_obj)
         mocker.patch(f"{MODULE}.AgentAppGenerateResponseConverter.convert", return_value={"result": "ok"})
-        file_mappings = [
-            {
-                "type": "image",
-                "transfer_method": "local_file",
-                "url": "",
-                "upload_file_id": "upload-file-1",
-            }
-        ]
 
         result = generator.generate(
             app_model=app_model,
             user=user,
-            args={"query": "hello", "inputs": {"name": "world"}, "files": file_mappings},
+            args={"query": "hello", "inputs": {"name": "world"}},
             invoke_from=InvokeFrom.WEB_APP,
             streaming=True,
         )
@@ -130,7 +119,6 @@ def test_generate_orchestrates_and_starts_worker(self, generator, mocker: Mocker
             draft_type=None,
             user=user,
         )
-        assert generate_entity.call_args.kwargs["prompt_file_mappings"] == file_mappings
 
     def test_generate_loads_existing_conversation(self, generator: AgentAppGenerator, mocker: MockerFixture):
         app_model = mocker.MagicMock(id="app1", tenant_id="tenant", mode="agent")
@@ -211,18 +199,10 @@ def ctx_manager(*args, **kwargs):
 
         mocker.patch("libs.flask_utils.preserve_flask_contexts", ctx_manager)
 
-    def _wire(
-        self,
-        generator: AgentAppGenerator,
-        mocker: MockerFixture,
-        *,
-        run_side_effect=None,
-        handled=False,
-        guard_query="query",
-    ):
+    def _wire(self, generator: AgentAppGenerator, mocker: MockerFixture, *, run_side_effect=None, handled=False):
         generator._get_conversation = mocker.MagicMock(return_value=mocker.MagicMock(id="conv"))
         generator._get_message = mocker.MagicMock(return_value=mocker.MagicMock(id="msg"))
-        generator._run_input_guards = mocker.MagicMock(return_value=(handled, guard_query))
+        generator._run_input_guards = mocker.MagicMock(return_value=(handled, "query"))
         generator._resolve_agent_by_id = mocker.MagicMock(
             return_value=(mocker.MagicMock(), mocker.MagicMock(), mocker.MagicMock())
         )
@@ -249,7 +229,6 @@ def _call(
         is_resume=False,
         query="query",
         runtime_session_snapshot_id="s",
-        prompt_file_mappings=(),
     ):
         generator._generate_worker(
             flask_app=mocker.MagicMock(),
@@ -260,7 +239,6 @@ def _call(
                 agent_runtime_session_snapshot_id=runtime_session_snapshot_id,
                 model_conf=mocker.MagicMock(model="m"),
                 query=query,
-                prompt_file_mappings=prompt_file_mappings,
             ),
             queue_manager=queue_manager,
             conversation_id="conv",
@@ -285,30 +263,6 @@ def test_worker_passes_runtime_session_scope_to_runner(self, generator, mocker:
         assert runner.run.call_args.kwargs["agent_config_snapshot_id"] == "s"
         assert runner.run.call_args.kwargs["session_scope_snapshot_id"] is None
 
-    def test_worker_appends_prompt_files_to_backend_query(self, generator, mocker: MockerFixture):
-        runner = self._wire(generator, mocker, guard_query="你看得见这张图片吗")
-        queue_manager = mocker.MagicMock()
-        file_mappings = [
-            {
-                "type": "image",
-                "transfer_method": "local_file",
-                "url": "",
-                "upload_file_id": "upload-file-1",
-            }
-        ]
-
-        self._call(
-            generator,
-            mocker,
-            queue_manager,
-            query="你看得见这张图片吗",
-            prompt_file_mappings=file_mappings,
-        )
-
-        assert runner.run.call_args.kwargs["query"] == (
-            f"你看得见这张图片吗\n{json.dumps(file_mappings, ensure_ascii=False)}"
-        )
-
     def test_input_guard_short_circuit_skips_backend(self, generator, mocker: MockerFixture):
         runner = self._wire(generator, mocker, handled=True)
         queue_manager = mocker.MagicMock()

web/features/agent-v2/agent-detail/configure/components/orchestrate/files/__tests__/index.spec.tsx

@@ -1,4 +1,3 @@
-import type { AgentConfigApiContext } from '../../config-context'
 import type { AgentSoulConfigFormState } from '@/features/agent-v2/agent-composer/form-state'
 import { toast } from '@langgenius/dify-ui/toast'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
@@ -10,6 +9,7 @@ import { formStateToAgentSoulConfig } from '@/features/agent-v2/agent-composer/c
 import { defaultAgentSoulConfigFormState } from '@/features/agent-v2/agent-composer/form-state'
 import { AgentComposerProvider } from '@/features/agent-v2/agent-composer/provider'
 import { agentComposerDraftAtom } from '@/features/agent-v2/agent-composer/store'
+import type { AgentConfigApiContext } from '../../config-context'
 import { AgentConfigApiContextProvider } from '../../config-context'
 import { AgentOrchestrateReadOnlyContext } from '../../read-only-context'
 import { AgentFiles } from '../index'

web/features/agent-v2/agent-detail/configure/components/orchestrate/skills/__tests__/index.spec.tsx

@@ -1,4 +1,3 @@
-import type { AgentConfigApiContext } from '../../config-context'
 import { toast } from '@langgenius/dify-ui/toast'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { fireEvent, render, screen, waitFor } from '@testing-library/react'
@@ -9,6 +8,7 @@ import { formStateToAgentSoulConfig } from '@/features/agent-v2/agent-composer/c
 import { defaultAgentSoulConfigFormState } from '@/features/agent-v2/agent-composer/form-state'
 import { AgentComposerProvider } from '@/features/agent-v2/agent-composer/provider'
 import { agentComposerDraftAtom } from '@/features/agent-v2/agent-composer/store'
+import type { AgentConfigApiContext } from '../../config-context'
 import { AgentConfigApiContextProvider } from '../../config-context'
 import { AgentOrchestrateReadOnlyContext } from '../../read-only-context'
 import { AgentSkills } from '../index'