Novice 8775003732 Merge branch 'main' into sandboxed-agent-rebase ...

Made-with: Cursor

# Conflicts:
#	api/tests/unit_tests/controllers/console/app/test_message.py
#	api/tests/unit_tests/controllers/console/app/test_statistic.py
#	api/tests/unit_tests/controllers/console/app/test_workflow_draft_variable.py
#	api/tests/unit_tests/controllers/console/auth/test_data_source_bearer_auth.py
#	api/tests/unit_tests/controllers/console/auth/test_data_source_oauth.py
#	api/tests/unit_tests/controllers/console/auth/test_oauth_server.py
#	web/app/components/header/account-setting/data-source-page/data-source-notion/operate/index.tsx
#	web/app/components/header/account-setting/data-source-page/data-source-website/config-firecrawl-modal.tsx
#	web/app/components/header/account-setting/data-source-page/data-source-website/config-jina-reader-modal.tsx
#	web/app/components/header/account-setting/data-source-page/data-source-website/config-watercrawl-modal.tsx
#	web/app/components/header/account-setting/data-source-page/panel/config-item.tsx
#	web/app/components/header/account-setting/data-source-page/panel/index.tsx
#	web/app/components/workflow/nodes/knowledge-retrieval/node.tsx
#	web/package.json
#	web/pnpm-lock.yaml

2026-03-24 11:19:50 +08:00

..

auth

fix: fix firecrawl url concat (#30008)

2025-12-24 09:40:32 +08:00

document_indexing_proxy

feat: enable tenant isolation on duplicate document indexing tasks (#29080)

2025-12-08 17:54:57 +08:00

enterprise

fix: enterprise API error handling and license enforcement (#33044)

2026-03-15 20:59:41 -07:00

entities

fix: Add the missing validation of doc_form in the service API. (#32892)

2026-03-03 15:54:43 +08:00

errors

Merge main HEAD (segment 5) into sandboxed-agent-rebase

2026-03-23 14:20:06 +08:00

plugin

fix: auto-activate credential when provider record exists without act… (#33503)

2026-03-17 17:27:11 +08:00

rag_pipeline

fix: adding a restore API for version control on workflow draft (#33582)

2026-03-20 14:54:23 +08:00

recommend_app

change all to httpx (#26119)

2025-10-10 23:41:16 +08:00

retention

feat: add metrics to clean message and workflow-run task (#33143)

2026-03-17 13:55:28 +08:00

sandbox

Merge branch 'feat/support-agent-sandbox' into sandboxed-agent-rebase

2026-03-23 20:19:16 +08:00

tools

Merge main HEAD (segment 5) into sandboxed-agent-rebase

2026-03-23 14:20:06 +08:00

trigger

Merge commit 'fb41b215' into sandboxed-agent-rebase

2026-03-23 10:52:06 +08:00

workflow

refactor: update model attribute references from 'model' to 'model_name' across multiple files and introduce new fetch_model_config function in llm_utils.py

2026-03-23 21:17:43 +08:00

__init__.py

chore(api/services): apply ruff reformatting (#7599)

2024-08-26 13:43:57 +08:00

account_service.py

refactor: replace sa.String with EnumText in mapped_column for type s… (#33332)

2026-03-14 13:38:27 +09:00

advanced_prompt_template_service.py

chore: adopt StrEnum and auto() for some string-typed enums (#25129)

2025-09-12 21:14:26 +08:00

agent_service.py

refactor(api): Query API to select function_1 (#33565)

2026-03-17 23:29:16 +09:00

annotation_service.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

api_based_extension_service.py

remove bare list, dict, Sequence, None, Any (#25058)

2025-09-06 03:32:23 +08:00

api_token_service.py

fix: redis for api token (#31861)

2026-02-06 16:25:27 +08:00

app_asset_package_service.py

refactor: unify download item types and eliminate extension-based branching

2026-03-10 17:12:15 +08:00

app_asset_service.py

refactor: unify download item types and eliminate extension-based branching

2026-03-10 17:12:15 +08:00

app_bundle_service.py

refactor: unify download item types and eliminate extension-based branching

2026-03-10 17:12:15 +08:00

app_dsl_service.py

chore: change draft var to user scoped (#33066)

2026-03-16 14:04:41 +08:00

app_generate_service.py

feat: support redis xstream (#32586)

2026-03-04 13:18:55 +08:00

app_model_config_service.py

refactor(api): add TypedDict definitions to models/model.py (#32925)

2026-03-06 08:42:54 +09:00

app_runtime_upgrade_service.py

feat: implement app runtime upgrade feature to clone and convert classic runtime apps to sandboxed mode

2026-03-17 13:54:16 +08:00

app_service.py

refactor(api): move workflow knowledge nodes and trigger nodes (#33445)

2026-03-15 15:24:59 +08:00

app_task_service.py

refactor: move workflow package to dify_graph (#32844)

2026-03-02 18:42:30 +08:00

asset_content_service.py

feat: add DB inline content cache for app asset draft files

2026-03-10 17:12:14 +08:00

async_workflow_service.py

refactor(api): replace dict/Mapping with TypedDict in trigger.py and workflow.py (#33562)

2026-03-17 13:14:42 +09:00

attachment_service.py

Feat/support multimodal embedding (#29115)

2025-12-09 14:41:46 +08:00

audio_service.py

refactor(api): add TypedDict definitions to models/model.py (#32925)

2026-03-06 08:42:54 +09:00

billing_service.py

chore: add guard tests for billing (#33831)

2026-03-23 09:45:32 +08:00

clear_free_plan_tenant_expired_logs.py

refactor(api): move model_runtime into dify_graph (#32858)

2026-03-02 20:15:32 +08:00

code_based_extension_service.py

remove bare list, dict, Sequence, None, Any (#25058)

2025-09-06 03:32:23 +08:00

conversation_service.py

refactor: move workflow package to dify_graph (#32844)

2026-03-02 18:42:30 +08:00

conversation_variable_updater.py

refactor: move workflow package to dify_graph (#32844)

2026-03-02 18:42:30 +08:00

credit_pool_service.py

refactor: use EnumText for TenantCreditPool.pool_type (#33959)

2026-03-24 02:51:10 +09:00

dataset_service.py

refactor: use EnumText for DocumentSegment.type (#33979)

2026-03-24 05:37:51 +09:00

datasource_provider_service.py

fix: use correct plugin_id for WaterCrawl datasource (#33182)

2026-03-10 13:32:40 +08:00

end_user_service.py

feat: Service API - add end-user lookup endpoint (#32015)

2026-02-09 15:39:16 +08:00

external_knowledge_service.py

refactor: move workflow package to dify_graph (#32844)

2026-03-02 18:42:30 +08:00

feature_service.py

Merge main HEAD (segment 5) into sandboxed-agent-rebase

2026-03-23 14:20:06 +08:00

feedback_service.py

refactor: use EnumText for MessageFeedback and MessageFile columns (#33738)

2026-03-20 01:13:26 +09:00

file_service.py

refactor: use EnumText(StorageType) for UploadFile.storage_type (#33728)

2026-03-19 15:15:32 +09:00

hit_testing_service.py

refactor: use EnumText for dataset and replace string literals 4 (#33606)

2026-03-18 09:18:08 +09:00

human_input_delivery_test_service.py

feat: apply markdown rendering to HITL email, sanitize email subject and body (#32305)

2026-03-16 16:52:46 +08:00

human_input_service.py

refactor: human input node decouple db (#32900)

2026-03-04 13:18:32 +08:00

knowledge_service.py

rm type ignore (#25715)

2025-10-21 11:26:58 +08:00

llm_generation_service.py

chore: remove unused changes

2025-12-10 15:04:19 +08:00

message_service.py

refactor: use EnumText for MessageFeedback and MessageFile columns (#33738)

2026-03-20 01:13:26 +09:00

metadata_service.py

refactor: use EnumText for dataset and replace string literals 4 (#33606)

2026-03-18 09:18:08 +09:00

model_load_balancing_service.py

refactor: use EnumText in provider models (#33634)

2026-03-18 13:27:40 +09:00

model_provider_service.py

refactor(api): move model_runtime into dify_graph (#32858)

2026-03-02 20:15:32 +08:00

oauth_server.py

use deco to avoid current_user (#26077)

2025-10-16 15:45:51 +09:00

operation_service.py

more httpx (#25651)

2025-09-22 23:07:09 +08:00

ops_service.py

feat: MLflow tracing (#26093)

2025-11-22 13:53:58 +08:00

recommended_app_service.py

feat: app trial (#26281)

2026-01-22 15:42:54 +08:00

saved_message_service.py

refactor: replace sa.String with EnumText in mapped_column for type s… (#33332)

2026-03-14 13:38:27 +09:00

skill_service.py

refactor: update model attribute references from 'model' to 'model_name' across multiple files and introduce new fetch_model_config function in llm_utils.py

2026-03-23 21:17:43 +08:00

storage_ticket_service.py

fix: agentbox using nginx for traffic proxy

2026-02-15 11:31:22 +08:00

summary_index_service.py

refactor(api): replace dict with SummaryIndexSettingDict TypedDict in core/rag (#33633)

2026-03-18 13:26:49 +09:00

tag_service.py

refactor: use EnumText for Conversation/Message invoke_from and from_source (#33901)

2026-03-23 16:03:35 +09:00

variable_truncator.py

Merge commit '92bde350' into sandboxed-agent-rebase

2026-03-23 09:39:49 +08:00

vector_service.py

refactor(api): replace dict/Mapping with TypedDict in dataset models (#33550)

2026-03-17 10:33:29 +09:00

web_conversation_service.py

refactor: replace sa.String with EnumText in mapped_column for type s… (#33332)

2026-03-14 13:38:27 +09:00

webapp_auth_service.py

chore: case insensitive email (#29978)

2026-01-13 15:42:44 +08:00

website_service.py

refactor(api): type WaterCrawl API responses with TypedDict (#33700)

2026-03-19 10:35:44 +09:00

workflow_app_service.py

refactor(api): type workflow service dicts with TypedDict (#33829)

2026-03-20 22:36:31 +09:00

workflow_collaboration_service.py

fix: make sure restart server not get ghost online user

2026-02-07 09:48:07 +08:00

workflow_comment_service.py

feat: mentioned user email can directly open app

2026-02-14 15:08:20 +08:00

workflow_draft_variable_service.py

refactor: use EnumText for Conversation/Message invoke_from and from_source (#33832)

2026-03-21 11:47:48 +09:00

workflow_event_snapshot_service.py

refactor: move workflow package to dify_graph (#32844)

2026-03-02 18:42:30 +08:00

workflow_restore.py

fix: adding a restore API for version control on workflow draft (#33582)

2026-03-20 14:54:23 +08:00

workflow_run_service.py

refactor(llm node): tool call tool result entity

2025-12-17 10:30:21 +08:00

workflow_service.py

Merge main HEAD (segment 5) into sandboxed-agent-rebase

2026-03-23 14:20:06 +08:00

workspace_service.py

fix: When the user is a non-sandbox user and has a paid balance, the … (#32173)

2026-02-10 15:36:40 +08:00