Novice 94b01f6821 Merge commit '92bde350' into sandboxed-agent-rebase ... Made-with: Cursor # Conflicts: # api/controllers/console/app/workflow_draft_variable.py # api/core/agent/cot_agent_runner.py # api/core/agent/cot_chat_agent_runner.py # api/core/agent/cot_completion_agent_runner.py # api/core/agent/fc_agent_runner.py # api/core/app/apps/advanced_chat/app_generator.py # api/core/app/apps/advanced_chat/app_runner.py # api/core/app/apps/agent_chat/app_runner.py # api/core/app/apps/workflow/app_generator.py # api/core/app/apps/workflow/app_runner.py # api/core/app/entities/app_invoke_entities.py # api/core/app/entities/queue_entities.py # api/core/llm_generator/output_parser/structured_output.py # api/core/workflow/workflow_entry.py # api/dify_graph/context/__init__.py # api/dify_graph/entities/tool_entities.py # api/dify_graph/file/file_manager.py # api/dify_graph/graph_engine/response_coordinator/coordinator.py # api/dify_graph/graph_events/node.py # api/dify_graph/node_events/node.py # api/dify_graph/nodes/agent/agent_node.py # api/dify_graph/nodes/llm/entities.py # api/dify_graph/nodes/llm/llm_utils.py # api/dify_graph/nodes/llm/node.py # api/dify_graph/nodes/question_classifier/question_classifier_node.py # api/dify_graph/runtime/graph_runtime_state.py # api/dify_graph/variables/segments.py # api/factories/variable_factory.py # api/services/variable_truncator.py # api/tests/unit_tests/utils/structured_output_parser/test_structured_output_parser.py # api/uv.lock # web/app/components/app-sidebar/app-info.tsx # web/app/components/app-sidebar/app-sidebar-dropdown.tsx # web/app/components/app/create-app-modal/index.spec.tsx # web/app/components/apps/__tests__/list.spec.tsx # web/app/components/apps/app-card.tsx # web/app/components/apps/list.tsx # web/app/components/header/account-dropdown/compliance.tsx # web/app/components/header/account-dropdown/index.tsx # web/app/components/header/account-dropdown/support.tsx # web/app/components/workflow-app/components/workflow-onboarding-modal/index.tsx # web/app/components/workflow/panel/debug-and-preview/hooks.ts # web/contract/console/apps.ts # web/contract/router.ts # web/eslint-suppressions.json # web/next.config.ts # web/pnpm-lock.yaml		2026-03-23 09:39:49 +08:00
..
__init__.py	use deco to avoid current_user (#26077)	2025-10-16 15:45:51 +09:00
account.py	fix: update core.file imports to core.workflow.file after merge	2026-03-19 18:05:55 +08:00
agent_providers.py	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
dsl.py	refactor: replace reqparse with Pydantic models in dsl and sandbox_providers	2026-02-04 13:23:07 +08:00
endpoint.py	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
error.py	fix: drop dead code phase2 unused class (#22042)	2025-07-17 09:33:07 +08:00
load_balancing_config.py	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
members.py	refactor: port api/controllers/console/app/annotation.py api/controllers/console/explore/trial.py api/controllers/console/workspace/account.py api/controllers/console/workspace/members.py api/controllers/service_api/app/annotation.py to basemodel (#31833)	2026-02-03 09:59:00 +08:00
model_providers.py	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
models.py	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
plugin.py	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
sandbox_providers.py	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
tool_providers.py	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
trigger_providers.py	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
workspace.py	feat: implement workspace permission checks for member invitations an… (#31202)	2026-01-18 19:35:50 -08:00