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

..

tools

test: migrate api tools manage service tests to testcontainers (#33956)

2026-03-24 02:54:33 +09:00

workflow

refactor: migrate workflow deletion tests to testcontainers (#33904)

2026-03-23 16:04:47 +09:00

__init__.py

Feat add testcontainers test for account service (#23380)

2025-08-05 20:15:39 +08:00

dataset_collection_binding.py

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

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

dataset_service_update_delete.py

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

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

document_service_status.py

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

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

test_account_service.py

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

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

test_advanced_prompt_template_service.py

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

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

test_agent_service.py

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

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

test_annotation_service.py

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

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

test_api_based_extension_service.py

test: migrate api based extension service tests to testcontainers (#33952)

2026-03-23 22:20:53 +09:00

test_app_dsl_service.py

refactor: use generate_valid_password helper for creating test account passwords (#33192)

2026-03-10 15:42:52 +08:00

test_app_generate_service.py

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

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

test_app_service.py

refactor: use generate_valid_password helper for creating test account passwords (#33192)

2026-03-10 15:42:52 +08:00

test_attachment_service.py

refactor: migrate attachment service tests to testcontainers (#33900)

2026-03-23 16:18:46 +09:00

test_billing_service.py

feat: get plan bulk with cache (#30339)

2025-12-30 09:27:46 +08:00

test_conversation_service.py

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

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

test_conversation_variable_updater.py

refactor: migrate conversation variable updater tests to testcontainers (#33903)

2026-03-23 16:06:08 +09:00

test_credit_pool_service.py

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

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

test_dataset_permission_service.py

test: migrate dataset permission tests to testcontainers (#33906)

2026-03-23 16:07:51 +09:00

test_dataset_service_batch_update_document_status.py

test: migrate batch update document status tests to testcontainers (#33951)

2026-03-23 21:57:01 +09:00

test_dataset_service_create_dataset.py

test: migrate dataset service create dataset tests to testcontainers (#33945)

2026-03-23 22:20:25 +09:00

test_dataset_service_delete_dataset.py

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

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

test_dataset_service_get_segments.py

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

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

test_dataset_service_retrieval.py

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

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

test_dataset_service_update_dataset.py

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

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

test_dataset_service.py

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

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

test_delete_archived_workflow_run.py

refactor: move workflow package to dify_graph (#32844)

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

test_document_service_display_status.py

test: remove mock tests superseded by testcontainers (#33957)

2026-03-24 02:46:54 +09:00

test_document_service_rename_document.py

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

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

test_end_user_service.py

test: migrate end user service batch tests to testcontainers (#33947)

2026-03-23 21:54:37 +09:00

test_feature_service.py

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

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

test_feedback_service.py

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

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

test_file_service_zip_and_lookup.py

test: migrate file service zip and lookup tests to testcontainers (#33944)

2026-03-23 21:52:31 +09:00

test_file_service.py

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

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

test_human_input_delivery_test.py

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

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

test_message_export_service.py

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

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

test_message_service_execution_extra_content.py

feat: Human Input Node (#32060)

2026-02-09 14:57:23 +08:00

test_message_service_extra_contents.py

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

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

test_message_service.py

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

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

test_messages_clean_service.py

refactor: use EnumText for TidbAuthBinding.status and MessageFile.type (#33975)

2026-03-24 05:38:29 +09:00

test_metadata_service.py

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

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

test_model_load_balancing_service.py

feat: replace db.session with db_session_with_containers (#32942)

2026-03-04 14:50:41 +09:00

test_model_provider_service.py

feat: replace db.session with db_session_with_containers (#32942)

2026-03-04 14:50:41 +09:00

test_oauth_server_service.py

test: migrate oauth server service tests to testcontainers (#33958)

2026-03-24 03:15:22 +09:00

test_restore_archived_workflow_run.py

test: migrate restore_archived_workflow_run SQL tests to testcontainers (#32590)

2026-02-26 03:24:58 +09:00

test_saved_message_service.py

test: migrate saved message service tests to testcontainers (#33949)

2026-03-23 22:26:31 +09:00

test_tag_service.py

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

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

test_trigger_provider_service.py

refactor: use generate_valid_password helper for creating test account passwords (#33192)

2026-03-10 15:42:52 +08:00

test_web_conversation_service.py

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

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

test_webapp_auth_service.py

refactor: use generate_valid_password helper for creating test account passwords (#33192)

2026-03-10 15:42:52 +08:00

test_webhook_service.py

refactor: Unify NodeConfigDict.data and BaseNodeData (#32780)

2026-03-11 23:43:58 +08:00

test_workflow_app_service.py

refactor: use EnumText for WorkflowAppLog.created_from and WorkflowArchiveLog columns (#33954)

2026-03-24 02:44:46 +09:00

test_workflow_draft_variable_service.py

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

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

test_workflow_run_service.py

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

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

test_workflow_service.py

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

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

test_workspace_service.py

feat: replace db.session with db_session_with_containers (#32942)

2026-03-04 14:50:41 +09:00