Stephen Zhou
da8c265342
Merge remote-tracking branch 'origin/main' into deploy/konwledge
2026-10-15 19:38:44 +08:00
Asuka Minato and Codex
1f3fdbc0d3
ci: enable Ruff SIM105 ( #44112 )
...
Co-authored-by: Codex <codex@openai.com >
2026-10-15 11:14:20 +00:00
Stephen Zhou and Claude Opus 5.5
3e9a74c111
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
Main's "remove KnowledgeFS and New Knowledge from main" (#44163 ) drops the
outdated copy of the feature; this branch carries the current one, so that
commit's deletions are intentionally not applied. Also adapt branch-only
code to the newly enabled Ruff SIM108 rule.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 18:58:00 +08:00
Asuka Minato and Codex
cd8301a468
ci: enable Ruff SIM108 ( #44113 )
...
Co-authored-by: Codex <codex@openai.com >
2026-10-15 09:45:52 +00:00
Stephen Zhou and Claude Opus 5.5
3d2a03136c
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
Conflict resolution notes:
- Adopt main's ORPCError-based HTTP errors: replace local responseStatus
helpers in new-rag with getHttpErrorStatus, make KnowledgeFS failure-body
and settings-save error mapping read ORPCError data, and update test
mocks to createHttpError.
- API keys: take main's split dialog components and drop api-key-modal;
re-apply KnowledgeFS space scoping on main's DatasetScopeDialog and
extract DatasetApiKeyDialogContent so the KnowledgeFS API access dialog
reuses the workspace dataset key manager.
- Adapt branch call sites to main's composed Avatar and AppIcon data APIs.
- Keep the branch's recursive S3 scan over main's duplicate implementation.
- Regenerate API contracts and keep both sides' i18n keys.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 15:04:46 +08:00
33b1c57f9d
feat: document API errors per code and narrow them with oRPC defined errors ( #44001 )
...
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-10-14 08:25:50 +00:00
Byron.wang and Stream
b71c5f8671
refactor(api): consolidate app queries and clarify session ownership ( #43288 )
...
Co-authored-by: Stream <Stream_2@qq.com >
2026-10-12 07:29:44 +00:00
Stephen Zhou and Claude Opus 5.5
709e879e9a
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
Port KnowledgeFS onto main's native Pydantic AI agent modules (Agenton
removed), reattach KnowledgeFS RBAC invalidation to the split RBAC
services, and adapt the new-rag settings form to the composable
IconPicker.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-10 22:54:29 +08:00
Byron.wang
2f20c7d958
refactor(api): separate workspace RBAC controllers and application service ( #43323 )
2026-10-10 09:46:01 +00:00
50f66b43c8
chore(api): bump minimum supported Python to 3.13 ( #43022 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Asuka Minato <i@asukaminato.eu.org >
Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com >
2026-10-09 10:47:03 +00:00
c0dbb26f3e
feat: access token feature ( #42293 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: yunlu.wen <yunlu.wen@dify.ai >
Co-authored-by: twwu <twwu@dify.ai >
2026-10-09 05:54:28 +00:00
Stephen Zhou and Claude Opus 5.5
7fb2f932fd
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
Adapt the KnowledgeFS branch to main's refactors:
- Move KnowledgeFS membership hooks from the removed account_service into
WorkspaceRepository/WorkspaceMemberService within the same transaction.
- Route Classic-to-Agent upgrade endpoints through a new
KnowledgeUpgradeApplicationService behind console_account_admission, and
carry creator_ids and knowledge_fs_upgrade through the dataset list service.
- Adopt main's data-source credential repository/gateways in KnowledgeFS
initial-source preview, tasks, and datasource backwards invocation.
- Take main's catalog-driven difyctl v2; the hand-written KnowledgeFS CLI
commands are dropped since the server catalog now drives commands.
- Port dify-ui API renames (AlertDialogFooter, DrawerClose + IconButton),
the lazy workflow panel map, the dataset card inline menu, and the new
date picker into the reorganized knowledge UI.
- Restore main's external knowledge endpoint JSON probe and missing oxlint
suppressions lost in earlier merges; regenerate contracts and OpenAPI docs.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-08 16:09:19 +08:00
Byron.wang and autofix-ci[bot]
95373bc4fd
refactor(api): consolidate account modules and shared errors ( #42570 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-09-30 07:26:44 +00:00
Xiyuan Chen and yunlu.wen
a4524c215f
feat(cli): difyctl v2 over the server catalog ( #42608 )
...
Co-authored-by: yunlu.wen <yunlu.wen@dify.ai >
2026-09-30 01:58:58 +00:00
Denis Ermakov
18fea7ff0d
chore(api): remove redundant str() on StringUUID ids ( #43061 )
2026-09-29 02:00:16 +00:00
Stephen Zhou
fd257028b0
Merge remote-tracking branch 'origin/main' into deploy/konwledge
2026-09-28 15:01:33 +08:00
henrydev23
174a908786
chore(api): remove unnecessary str calls in openapi controllers ( #42931 )
2026-09-28 02:17:48 +00:00
gn
90e590e48d
chore(api): remove unnecessary str() calls in controllers/openapi/workspaces ( #42932 )
2026-09-25 02:09:31 +00:00
Stephen Zhou
dd80cdcab6
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
# Conflicts:
# api/controllers/console/app/app_import.py
# api/controllers/console/datasets/datasets.py
# api/services/dataset_service.py
# api/tests/unit_tests/controllers/console/datasets/test_datasets.py
# pnpm-lock.yaml
# web/app/components/base/markdown/index.tsx
# web/app/components/datasets/list/dataset-card/operations.tsx
# web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/__tests__/index.spec.tsx
# web/i18n/locales/ar-TN/workflow.json
# web/i18n/locales/de-DE/workflow.json
# web/i18n/locales/en-US/workflow.json
# web/i18n/locales/es-ES/workflow.json
# web/i18n/locales/fa-IR/workflow.json
# web/i18n/locales/fr-FR/workflow.json
# web/i18n/locales/hi-IN/workflow.json
# web/i18n/locales/id-ID/workflow.json
# web/i18n/locales/it-IT/workflow.json
# web/i18n/locales/ja-JP/workflow.json
# web/i18n/locales/ko-KR/workflow.json
# web/i18n/locales/lo-LA/workflow.json
# web/i18n/locales/nl-NL/workflow.json
# web/i18n/locales/pl-PL/workflow.json
# web/i18n/locales/pt-BR/workflow.json
# web/i18n/locales/ro-RO/workflow.json
# web/i18n/locales/ru-RU/workflow.json
# web/i18n/locales/sl-SI/workflow.json
# web/i18n/locales/th-TH/workflow.json
# web/i18n/locales/tr-TR/workflow.json
# web/i18n/locales/uk-UA/workflow.json
# web/i18n/locales/vi-VN/workflow.json
# web/i18n/locales/zh-Hans/workflow.json
# web/i18n/locales/zh-Hant/workflow.json
# web/i18n/resources.generated.d.ts
# web/package.json
2026-09-24 16:03:06 +08:00
Byron.wang and autofix-ci[bot]
635143cb88
refactor(api): thin console app controllers and separate application boundaries ( #42671 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-09-24 06:17:38 +00:00
Stephen Zhou
5ab31b78e7
Merge remote-tracking branch 'origin/main' into deploy/konwledge
2026-09-24 08:59:21 +08:00
Byron.wang
16d3302bff
refactor(api): isolate OAuth device flow orchestration ( #41361 )
2026-09-23 06:36:48 +00:00
Stephen Zhou
aca6580790
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
# Conflicts:
# api/constants/__init__.py
# api/controllers/openapi/_errors.py
# api/controllers/openapi/_version_gate.py
# api/extensions/ext_blueprints.py
# api/tests/unit_tests/controllers/openapi/test_auth_matrix.py
# api/tests/unit_tests/controllers/openapi/test_error_contract.py
# api/tests/unit_tests/controllers/service_api/test_wraps.py
# api/tests/unit_tests/core/workflow/nodes/agent_v2/test_agent_node.py
# packages/contracts/console.ts
# packages/contracts/generated/api/console/orpc.gen.ts
# packages/contracts/generated/api/console/router.gen.ts
# packages/contracts/generated/api/openapi/orpc.gen.ts
# packages/contracts/generated/api/openapi/zod.gen.ts
# packages/contracts/generated/api/service/orpc.gen.ts
# packages/contracts/generated/knowledge-fs/metadata.gen.ts
# packages/contracts/generated/knowledge-fs/orpc.gen.ts
# packages/contracts/openapi-ts.knowledge-fs.config.ts
# web/features/agent-v2/agent-detail/configure/components/orchestrate/knowledge/index.tsx
2026-09-23 09:20:42 +08:00
Byron.wang
ce2eaab9f7
refactor(api): move app-scoped end users behind application services ( #41398 )
2026-09-22 11:20:45 +00:00
Xiyuan Chen and autofix-ci[bot]
dfc3bbe513
feat(openapi): publish the op catalog, per-mode run ops and server-built hints on /openapi/v1 ( #42487 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-09-22 10:44:50 +00:00
Stephen Zhou
fc50e67142
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
# Conflicts:
# api/tests/unit_tests/controllers/openapi/test_workflow_events_openapi.py
# web/app/components/datasets/list/dataset-card/components/__tests__/operations-dropdown.spec.tsx
# web/app/components/datasets/list/dataset-card/components/dataset-card-footer.tsx
# web/app/components/datasets/list/dataset-card/components/dataset-card-header.tsx
# web/app/components/datasets/list/dataset-card/components/operations-dropdown.tsx
# web/app/components/datasets/list/dataset-card/index.tsx
# web/app/components/header/account-setting/model-provider-page/model-selector/model-selector-trigger.tsx
# web/features/new-rag/__tests__/add-source-page.spec.tsx
# web/features/new-rag/add-source-page.tsx
# web/features/new-rag/document-chunk-detail.tsx
# web/features/new-rag/document-chunk-tree.tsx
# web/features/new-rag/documents-page.tsx
# web/features/new-rag/documents/__tests__/page.spec.tsx
# web/features/new-rag/documents/tasks/auxiliary-read-guard.ts
# web/features/new-rag/knowledge-space-shell.tsx
# web/features/new-rag/processing-tasks-drawer.tsx
2026-09-21 09:49:29 +08:00
Xiyuan Chen and autofix-ci[bot]
bc0636c4db
refactor(openapi): route /openapi/v1 auth by subject ( #41420 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-09-18 08:42:53 +00:00
Stephen Zhou
9583c98a06
Merge remote-tracking branch 'origin/main' into deploy/konwledge
2026-09-18 15:02:17 +08:00
Xiyuan Chen
3d436a7e31
refactor(openapi): delete the dead bearer→handler auth adapter ( #41311 )
2026-09-18 06:27:49 +00:00
Stephen Zhou
bd74150f6a
fix(knowledge): complete agent knowledge base naming
2026-09-08 13:16:16 +08:00
Stephen Zhou
e6ac86e8d5
refactor(knowledge): adopt agent knowledge base naming
2026-09-08 13:05:17 +08:00
Stephen Zhou
4b3948d3e2
refactor(knowledge): distinguish original and agentic naming
2026-09-08 12:38:41 +08:00
Stephen Zhou
12a5189576
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
# Conflicts:
# api/core/rbac/entities.py
# api/extensions/ext_application_services.py
# api/extensions/ext_commands.py
# api/services/enterprise/rbac_service.py
# api/tests/unit_tests/controllers/console/app/test_agent_manage_guard.py
# web/app/components/datasets/list/__tests__/index.spec.tsx
2026-09-08 09:26:30 +08:00
yyh
eba589db89
refactor(api): remove legacy billing enabled state ( #41917 )
2026-09-07 08:29:57 +00:00
Xiyuan Chen and autofix-ci[bot]
86134ea99e
feat(rbac): agent RBAC/ACL scenes and resource-locator check bundles ( #41768 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-09-07 04:39:43 +00:00
Stephen Zhou
38457f27fb
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
# Conflicts:
# .agents/skills/how-to-write-component/references/data.md
# .agents/skills/how-to-write-component/references/ownership.md
# api/controllers/inner_api/__init__.py
# api/tests/test_containers_integration_tests/services/test_account_service.py
# api/tests/unit_tests/services/test_account_service.py
# packages/iconify-collections/custom-public/icons.json
# packages/iconify-collections/custom-public/info.json
# web/features/new-rag/__tests__/new-knowledge-list.spec.tsx
# web/features/new-rag/components/knowledge-space-card.tsx
# web/features/new-rag/document-chunk-tree.tsx
# web/features/tag-management/components/tag-search-content.tsx
# web/features/tag-management/components/tag-selector.tsx
# web/service/client.spec.ts
2026-09-04 19:42:31 +08:00
Byron.wang
09f301d969
refactor(api): move OpenAPI account access behind application services ( #41308 )
2026-09-04 07:38:01 +00:00
Stephen Zhou
42cb6519ea
Merge remote-tracking branch 'origin/main' into deploy/konwledge
2026-09-03 16:32:30 +08:00
非法操作
d8c3f7c5ee
refactor(openapi): inject file upload service ( #41606 )
2026-09-03 04:42:31 +00:00
Stephen Zhou
cd7e1be7cb
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
# Conflicts:
# api/services/feature_service.py
# api/tests/unit_tests/controllers/console/workspace/test_members.py
# api/tests/unit_tests/core/workflow/nodes/agent_v2/test_validators.py
# api/tests/unit_tests/services/test_system_feature_service_knowledge_fs.py
# pnpm-lock.yaml
2026-09-02 10:31:10 +08:00
Byron.wang and autofix-ci[bot]
c4ea406586
refactor(api): decouple system features and web adapters ( #40772 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-09-01 11:50:52 +00:00
Stephen Zhou
ecd41aed3f
Merge remote-tracking branch 'origin/main' into deploy/konwledge
2026-09-01 09:45:49 +08:00
zyssyz123 and autofix-ci[bot]
762019a160
fix(workflow): block manual runs for trigger workflows ( #41519 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-08-31 09:30:52 +00:00
Stephen Zhou
e6fe2cd5d7
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
# Conflicts:
# api/tests/unit_tests/controllers/inner_api/test_auth_wraps.py
# api/tests/unit_tests/services/test_async_workflow_service.py
# web/features/new-rag/__tests__/new-knowledge-list.spec.tsx
2026-08-21 10:39:39 +08:00
WH-2099
edc805c453
fix(api): enforce app-scoped access on indirect resources ( #40893 )
2026-08-21 00:52:39 +00:00
Stephen Zhou
574461604d
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
# Conflicts:
# api/commands/system.py
# api/controllers/console/init_validate.py
# api/controllers/console/workspace/account.py
# api/controllers/console/wraps.py
# api/controllers/openapi/auth/data.py
# api/core/hosting_configuration.py
# api/core/provider_manager.py
# api/core/rag/retrieval/dataset_retrieval.py
# api/services/workspace_service.py
# api/tasks/workflow_cfs_scheduler/entities.py
# api/tests/test_containers_integration_tests/controllers/console/auth/test_password_reset.py
# api/tests/test_containers_integration_tests/services/test_feature_service.py
# api/tests/unit_tests/controllers/console/auth/test_account_activation.py
# api/tests/unit_tests/controllers/openapi/auth/test_data.py
# api/tests/unit_tests/controllers/service_api/app/test_hitl_service_api.py
# api/tests/unit_tests/extensions/otel/test_retrieval_tracing.py
# api/tests/unit_tests/services/test_feature_service_knowledge_fs.py
# dev/start-worker
# packages/contracts/console.ts
# packages/contracts/package.json
# packages/iconify-collections/custom-public/icons.json
# web/app/components/workflow/__tests__/index.spec.tsx
# web/app/components/workflow/index.tsx
# web/features/new-rag/document-chunk-tree.tsx
# web/service/fetch.spec.ts
2026-08-12 10:33:29 +08:00
Byron.wang and autofix-ci[bot]
c1e94f8ee7
refactor(api): consolidate deployment edition handling ( #40142 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-08-11 07:39:01 +00:00
Stephen Zhou
fde800e337
Merge remote-tracking branch 'origin/main' into deploy/konwledge
...
# Conflicts:
# .github/dependabot.yml
# .github/workflows/deploy-dev.yml
# api/app_factory.py
# api/core/indexing_runner.py
# api/services/feature_service.py
# api/tests/test_containers_integration_tests/controllers/console/auth/test_password_reset.py
# api/tests/test_containers_integration_tests/services/test_feature_service.py
# api/tests/unit_tests/controllers/console/auth/test_account_activation.py
# api/tests/unit_tests/controllers/service_api/app/test_conversation.py
# api/tests/unit_tests/controllers/web/test_site.py
# api/tests/unit_tests/core/rag/indexing/test_indexing_runner.py
# api/tests/unit_tests/core/tools/test_base_tool.py
# api/tests/unit_tests/extensions/otel/test_retrieval_tracing.py
# api/tests/unit_tests/extensions/test_ext_login.py
# api/tests/unit_tests/services/test_feature_service_deployment_edition.py
# api/tests/unit_tests/services/test_feature_service_knowledge_fs.py
# api/tests/unit_tests/services/test_feature_service_licensed_seats.py
2026-08-07 09:55:10 +08:00
Byron.wang
b76a14d71d
refactor(api): decouple console queries through application services ( #40031 )
2026-08-07 00:42:55 +00:00
Stephen Zhou
28b3306867
Merge remote-tracking branch 'origin/main' into deploy/konwledge
2026-08-04 14:43:38 +08:00
Stephen Zhou
Asuka MinatoandCodex
Byron.wangandStream
Xiyuan Chenandyunlu.wen
Denis Ermakov
henrydev23
gn
yyh
非法操作
zyssyz123andautofix-ci[bot]
WH-2099