|
|
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 |
|
|
|
dcd614ca77
|
feat: add LLM quota deduction functionality and enhance model configuration handling in llm_utils.py; update test cases for LLM node context handling
|
2026-03-24 08:45:11 +08:00 |
|
|
|
49a1fae555
|
test: migrate password reset tests to testcontainers (#33974)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-24 06:04:34 +09:00 |
|
|
|
cc17c8e883
|
refactor: use EnumText for TidbAuthBinding.status and MessageFile.type (#33975)
|
2026-03-24 05:38:29 +09:00 |
|
|
|
5d2cb3cd80
|
refactor: use EnumText for DocumentSegment.type (#33979)
|
2026-03-24 05:37:51 +09:00 |
|
|
|
f2c71f3668
|
test: migrate oauth server service tests to testcontainers (#33958)
|
2026-03-24 03:15:22 +09:00 |
|
|
|
0492ed7034
|
test: migrate api tools manage service tests to testcontainers (#33956)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-24 02:54:33 +09:00 |
|
|
|
dd4f504b39
|
refactor: select in remaining console app controllers (#33969)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-24 02:53:05 +09:00 |
|
|
|
8ca1ebb96d
|
test: migrate workflow tools manage service tests to testcontainers (#33955)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-24 02:50:10 +09:00 |
|
|
|
3f086b97b6
|
test: remove mock tests superseded by testcontainers (#33957)
|
2026-03-24 02:46:54 +09:00 |
|
|
|
4a2e9633db
|
refactor: use EnumText for ApiToken.type (#33961)
|
2026-03-24 02:46:06 +09:00 |
|
|
|
f5cc1c8b75
|
test: migrate saved message service tests to testcontainers (#33949)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-23 22:26:31 +09:00 |
|
|
|
6698b42f97
|
test: migrate api based extension service tests to testcontainers (#33952)
|
2026-03-23 22:20:53 +09:00 |
|
|
|
848a041c25
|
test: migrate dataset service create dataset tests to testcontainers (#33945)
|
2026-03-23 22:20:25 +09:00 |
|
|
|
30deeb6f1c
|
feat(firecrawl): follow pagination when crawl status is completed (#33864)
Co-authored-by: Crazywoola <100913391+crazywoola@users.noreply.github.com>
|
2026-03-23 21:19:32 +08:00 |
|
|
|
ed1bd338f1
|
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 |
|
|
|
30dd36505c
|
test: migrate batch update document status tests to testcontainers (#33951)
|
2026-03-23 21:57:01 +09:00 |
|
|
|
65223c8092
|
test: remove mock-based tests superseded by testcontainers (#33946)
|
2026-03-23 21:55:50 +09:00 |
|
|
|
72e3fcd25f
|
test: migrate end user service batch tests to testcontainers (#33947)
|
2026-03-23 21:54:37 +09:00 |
|
|
|
4b4a5c058e
|
test: migrate file service zip and lookup tests to testcontainers (#33944)
|
2026-03-23 21:52:31 +09:00 |
|
|
|
d956b919a0
|
ci: fix AttributeError: 'Flask' object has no attribute 'login_manager' FAILED #33891 (#33896)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-23 20:27:14 +08:00 |
|
|
|
abda859075
|
refactor: migrate execution extra content repository tests from mocks to testcontainers (#33852)
|
2026-03-23 17:32:11 +09:00 |
|
|
|
02e13e6d05
|
refactor: select in console app message controller (#33893)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-23 16:38:04 +09:00 |
|
|
|
ba7827acd1
|
fix: resolve test failures and lint errors after segment 5 merge
- Add login_manager mock to controller test fixtures (6 files)
- Remove duplicate MemoryConfig import in llm_utils.py
- Fix line-too-long in test_workflow_draft_variable.py
Made-with: Cursor
|
2026-03-23 15:23:33 +08:00 |
|
|
|
82b094a2d5
|
refactor: migrate attachment service tests to testcontainers (#33900)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-23 16:18:46 +09:00 |
|
|
|
6014853d45
|
test: migrate dataset permission tests to testcontainers (#33906)
|
2026-03-23 16:07:51 +09:00 |
|
|
|
a71b7909fd
|
refactor: migrate conversation variable updater tests to testcontainers (#33903)
|
2026-03-23 16:06:08 +09:00 |
|
|
|
1bf296982b
|
refactor: migrate workflow deletion tests to testcontainers (#33904)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-23 16:04:47 +09:00 |
|
|
|
2b6f761dfe
|
refactor: use EnumText for Conversation/Message invoke_from and from_source (#33901)
|
2026-03-23 16:03:35 +09:00 |
|
|
|
6ecf89e262
|
refactor: migrate credit pool service tests to testcontainers (#33898)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-23 15:59:16 +09:00 |
|
|
|
244f9e0c11
|
fix: handle null email/name from GitHub API for private-email users (#33882)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com>
|
2026-03-23 14:53:03 +08:00 |
|
|
|
fd124e6d32
|
Merge main HEAD (segment 5) into sandboxed-agent-rebase
Resolve 83 conflicts: 10 backend, 62 frontend, 11 config/lock files.
Preserve sandbox/agent/collaboration features while adopting main's
UI refactorings (Dialog/AlertDialog/Popover), model provider updates,
and enterprise features.
Made-with: Cursor
|
2026-03-23 14:20:06 +08:00 |
|
|
|
a28f22e59d
|
fix: resolve import errors and test failures after segment 4 merge
- Update BaseNodeData import path to dify_graph.entities.base_node_data
- Change NodeType.COMMAND/FILE_UPLOAD to BuiltinNodeTypes constants
- Fix system_oauth_encryption -> system_encryption rename in commands
- Remove tests for deleted agent runner modules
- Fix Avatar: named import + string size API in collaboration files
- Add missing skill feature deps: @monaco-editor/react, react-arborist,
@tanstack/react-virtual
- Fix frontend test mocks: add useUserProfile, useLeaderRestoreListener,
next/navigation mock, and nodeOutputVars to expected payload
Made-with: Cursor
|
2026-03-23 13:59:09 +08:00 |
|
|
|
01d97fa2cf
|
fix: type object 'str' has no attribute 'LLM' (#33899)
|
2026-03-23 14:51:56 +09:00 |
|
|
|
5041d96bb1
|
Merge commit 'fb41b215' into sandboxed-agent-rebase
Made-with: Cursor
# Conflicts:
# .devcontainer/post_create_command.sh
# api/commands.py
# api/core/agent/cot_agent_runner.py
# api/core/agent/fc_agent_runner.py
# api/core/app/apps/workflow_app_runner.py
# api/core/app/entities/queue_entities.py
# api/core/app/entities/task_entities.py
# api/core/workflow/workflow_entry.py
# api/dify_graph/enums.py
# api/dify_graph/graph/graph.py
# api/dify_graph/graph_events/node.py
# api/dify_graph/model_runtime/entities/message_entities.py
# api/dify_graph/node_events/node.py
# api/dify_graph/nodes/agent/agent_node.py
# api/dify_graph/nodes/base/__init__.py
# api/dify_graph/nodes/base/entities.py
# api/dify_graph/nodes/base/node.py
# api/dify_graph/nodes/llm/entities.py
# api/dify_graph/nodes/llm/node.py
# api/dify_graph/nodes/tool/tool_node.py
# api/pyproject.toml
# api/uv.lock
# web/app/components/base/avatar/__tests__/index.spec.tsx
# web/app/components/base/avatar/index.tsx
# web/app/components/base/date-and-time-picker/time-picker/__tests__/index.spec.tsx
# web/app/components/base/file-uploader/file-from-link-or-local/index.tsx
# web/app/components/base/prompt-editor/index.tsx
# web/app/components/datasets/metadata/edit-metadata-batch/modal.tsx
# web/app/components/header/account-dropdown/index.spec.tsx
# web/app/components/share/text-generation/index.tsx
# web/app/components/workflow/block-selector/tool/action-item.tsx
# web/app/components/workflow/block-selector/trigger-plugin/action-item.tsx
# web/app/components/workflow/hooks/use-edges-interactions.ts
# web/app/components/workflow/hooks/use-nodes-interactions.ts
# web/app/components/workflow/index.tsx
# web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
# web/app/components/workflow/nodes/http/components/key-value/key-value-edit/index.tsx
# web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-item.tsx
# web/app/components/workflow/nodes/loop/use-interactions.ts
# web/contract/router.ts
# web/env.ts
# web/eslint-suppressions.json
# web/package.json
# web/pnpm-lock.yaml
|
2026-03-23 10:52:06 +08:00 |
|
|
|
b15a9bea21
|
style: auto-format after segment 3 import migrations
Made-with: Cursor
|
2026-03-23 10:37:02 +08:00 |
|
|
|
6b75188ddc
|
fix: resolve import migrations and test failures after segment 3 merge
- Migrate core.model_runtime -> dify_graph.model_runtime across 20+ files
- Migrate core.workflow.file -> dify_graph.file across 15+ files
- Migrate core.workflow.enums -> dify_graph.enums in service files
- Fix SandboxContext phantom import in dify_graph/context/__init__.py
- Fix core.app.workflow.node_factory -> core.workflow.node_factory
- Fix toast import paths (useToastContext from toast/context)
- Fix app-info.tsx import paths for relocated app-operations
- Fix 15 frontend test files for API changes, missing QueryClientProvider,
i18n key renames, and component behavior changes
Made-with: Cursor
|
2026-03-23 10:31:11 +08:00 |
|
|
|
886854eff8
|
chore: add guard tests for billing (#33831)
Co-authored-by: 非法操作 <hjlarry@163.com>
|
2026-03-23 09:45:32 +08:00 |
|
|
|
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 |
|
|
|
cbdcdcc2b9
|
fix: resolve test failures after segment 2 merge
- Backend: fix deduct_llm_quota import path in llm node
- Backend: update core.variables → core.workflow.variables imports
- Frontend: update UpdateWorkflowNodesMapPayload in tests
- Frontend: fix various test expectations to match merged code
Made-with: Cursor
|
2026-03-23 09:18:26 +08:00 |
|
|
|
66e67caa2b
|
fix: update core.variables imports to core.workflow.variables after S2 merge
Made-with: Cursor
|
2026-03-23 09:05:37 +08:00 |
|
|
|
cccff6768a
|
Merge commit '9c339239' into sandboxed-agent-rebase
Made-with: Cursor
# Conflicts:
# api/README.md
# api/controllers/console/app/workflow_draft_variable.py
# api/core/agent/cot_agent_runner.py
# api/core/agent/fc_agent_runner.py
# api/core/app/apps/advanced_chat/app_runner.py
# api/core/plugin/backwards_invocation/model.py
# api/core/prompt/advanced_prompt_transform.py
# api/core/workflow/nodes/base/node.py
# api/core/workflow/nodes/llm/llm_utils.py
# api/core/workflow/nodes/llm/node.py
# api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py
# api/core/workflow/nodes/question_classifier/question_classifier_node.py
# api/core/workflow/runtime/graph_runtime_state.py
# api/extensions/storage/base_storage.py
# api/factories/variable_factory.py
# api/pyproject.toml
# api/services/variable_truncator.py
# api/uv.lock
# web/app/account/oauth/authorize/page.tsx
# web/app/components/app/configuration/config-var/config-modal/field.tsx
# web/app/components/base/alert.tsx
# web/app/components/base/chat/chat/answer/human-input-content/executed-action.tsx
# web/app/components/base/chat/chat/answer/more.tsx
# web/app/components/base/chat/chat/answer/operation.tsx
# web/app/components/base/chat/chat/answer/workflow-process.tsx
# web/app/components/base/chat/chat/citation/index.tsx
# web/app/components/base/chat/chat/citation/popup.tsx
# web/app/components/base/chat/chat/citation/progress-tooltip.tsx
# web/app/components/base/chat/chat/citation/tooltip.tsx
# web/app/components/base/chat/chat/question.tsx
# web/app/components/base/chat/embedded-chatbot/inputs-form/index.tsx
# web/app/components/base/chat/embedded-chatbot/inputs-form/view-form-dropdown.tsx
# web/app/components/base/markdown-blocks/form.tsx
# web/app/components/base/prompt-editor/plugins/hitl-input-block/component-ui.tsx
# web/app/components/base/tag-management/panel.tsx
# web/app/components/base/tag-management/trigger.tsx
# web/app/components/header/account-setting/index.tsx
# web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx
# web/app/components/header/account-setting/model-provider-page/provider-added-card/index.tsx
# web/app/signin/utils/post-login-redirect.ts
# web/eslint-suppressions.json
# web/package.json
# web/pnpm-lock.yaml
|
2026-03-23 09:00:45 +08:00 |
|
|
|
51c418f497
|
fix: update remaining core.file imports missed in previous commit
Made-with: Cursor
|
2026-03-23 08:39:48 +08:00 |
|
|
|
e6d1431a02
|
test: improve code-cov for controller tests (#33225)
|
2026-03-23 00:29:18 +08:00 |
|
|
|
b53675a16c
|
test: add unit tests for services-part-1 (#33050)
|
2026-03-23 00:02:41 +08:00 |
|
|
|
31506b27ab
|
test: added for core module moderation, repositories, schemas (#32514)
Co-authored-by: Rajat Agarwal <rajat.agarwal@infocusp.com>
|
2026-03-22 23:57:12 +08:00 |
|
|
|
40846c262c
|
perf: tidb_on_qdrant_vector delete_by_ids use batch delete (#33846)
|
2026-03-22 21:09:43 +09:00 |
|
|
|
35cbd83e83
|
refactor: select in console explore and workspace controllers (#33842)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-21 20:06:17 +09:00 |
|
|
|
2ce2fbc2d4
|
refactor: migrate workflow run repository unit tests from mocks to te… (#33843)
|
2026-03-21 19:54:56 +09:00 |
|
|
|
097773c9f5
|
refactor: migrate workflow run repository tests from mocks to … (#33837)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-21 14:23:11 +09:00 |
|
