c09ea2fc3b
fix: fix permission check
2026-05-29 10:16:31 +08:00
4c15e16f59
Merge remote-tracking branch 'upstream/main' into feat/rbac
...
# Conflicts:
# .github/workflows/cli-tests.yml
# api/clients/agent_backend/__init__.py
# api/clients/agent_backend/request_builder.py
# api/controllers/console/app/app.py
# api/controllers/console/app/mcp_server.py
# api/controllers/console/workspace/members.py
# api/controllers/openapi/__init__.py
# api/controllers/openapi/_models.py
# api/controllers/openapi/account.py
# api/controllers/openapi/app_run.py
# api/controllers/openapi/apps.py
# api/controllers/openapi/apps_permitted_external.py
# api/controllers/openapi/auth/__init__.py
# api/controllers/openapi/auth/composition.py
# api/controllers/openapi/auth/pipeline.py
# api/controllers/openapi/files.py
# api/controllers/openapi/human_input_form.py
# api/controllers/openapi/workflow_events.py
# api/controllers/openapi/workspaces.py
# api/core/workflow/node_factory.py
# api/core/workflow/nodes/agent_v2/agent_node.py
# api/core/workflow/nodes/agent_v2/runtime_request_builder.py
# api/libs/oauth_bearer.py
# api/models/agent_config_entities.py
# api/openapi/markdown/openapi-swagger.md
# api/services/account_service.py
# api/tests/unit_tests/clients/agent_backend/test_request_builder.py
# api/tests/unit_tests/controllers/console/test_workspace_members.py
# api/tests/unit_tests/controllers/console/workspace/test_members.py
# api/tests/unit_tests/controllers/openapi/auth/test_composition.py
# api/tests/unit_tests/controllers/openapi/auth/test_pipeline.py
# api/tests/unit_tests/controllers/openapi/conftest.py
# api/tests/unit_tests/controllers/openapi/test_account.py
# api/tests/unit_tests/controllers/openapi/test_app_run_streaming.py
# api/tests/unit_tests/controllers/openapi/test_human_input_form.py
# api/tests/unit_tests/controllers/openapi/test_workflow_events_openapi.py
# api/tests/unit_tests/core/workflow/nodes/agent_v2/test_agent_node.py
# api/tests/unit_tests/core/workflow/nodes/agent_v2/test_runtime_request_builder.py
# api/tests/unit_tests/libs/test_oauth_bearer_rate_limit_ordering.py
# api/tests/unit_tests/libs/test_oauth_bearer_require_scope.py
# api/tests/unit_tests/libs/test_workspace_member_helper.py
# api/tests/unit_tests/services/test_oauth_device_flow.py
# cli/AGENTS.md
# cli/ARD.md
# cli/package.json
# cli/src/api/account-sessions.ts
# cli/src/api/app-meta.test.ts
# cli/src/api/workspaces.ts
# cli/src/auth/file-backend.test.ts
# cli/src/auth/file-backend.ts
# cli/src/auth/hosts.test.ts
# cli/src/auth/hosts.ts
# cli/src/cache/app-info.test.ts
# cli/src/cache/app-info.ts
# cli/src/cache/nudge-store.test.ts
# cli/src/cache/nudge-store.ts
# cli/src/commands/_shared/authed-command.ts
# cli/src/commands/auth/devices/_shared/devices.test.ts
# cli/src/commands/auth/devices/_shared/devices.ts
# cli/src/commands/auth/devices/list/index.ts
# cli/src/commands/auth/login/index.ts
# cli/src/commands/auth/login/login.test.ts
# cli/src/commands/auth/login/login.ts
# cli/src/commands/auth/logout/index.ts
# cli/src/commands/auth/logout/logout.test.ts
# cli/src/commands/auth/logout/logout.ts
# cli/src/commands/auth/status/index.ts
# cli/src/commands/auth/status/status.test.ts
# cli/src/commands/auth/status/status.ts
# cli/src/commands/auth/whoami/index.ts
# cli/src/commands/auth/whoami/whoami.test.ts
# cli/src/commands/auth/whoami/whoami.ts
# cli/src/commands/config/get/index.ts
# cli/src/commands/config/get/run.test.ts
# cli/src/commands/config/get/run.ts
# cli/src/commands/config/path/index.ts
# cli/src/commands/config/set/index.ts
# cli/src/commands/config/set/run.test.ts
# cli/src/commands/config/set/run.ts
# cli/src/commands/config/unset/index.ts
# cli/src/commands/config/unset/run.test.ts
# cli/src/commands/config/unset/run.ts
# cli/src/commands/config/view/index.ts
# cli/src/commands/config/view/run.test.ts
# cli/src/commands/config/view/run.ts
# cli/src/commands/describe/app/run.test.ts
# cli/src/commands/describe/app/run.ts
# cli/src/commands/env/list/run-list.ts
# cli/src/commands/get/app/run.ts
# cli/src/commands/get/workspace/run.ts
# cli/src/commands/resume/app/run.ts
# cli/src/commands/run/app/_strategies/streaming-structured.ts
# cli/src/commands/run/app/_strategies/streaming-text.ts
# cli/src/commands/run/app/handlers.ts
# cli/src/commands/run/app/hitl-render.ts
# cli/src/commands/run/app/run.test.ts
# cli/src/commands/run/app/run.ts
# cli/src/commands/run/app/stream-handlers.ts
# cli/src/commands/tree.generated.ts
# cli/src/commands/version/index.ts
# cli/src/env/registry.ts
# cli/src/errors/format.ts
# cli/src/util/browser.ts
# cli/src/version/info.ts
# cli/src/version/nudge.test.ts
# cli/src/version/nudge.ts
# cli/src/version/probe.test.ts
# cli/src/version/probe.ts
# cli/src/version/render.ts
# cli/src/workspace/resolver.ts
# cli/tsconfig.json
# eslint-suppressions.json
# packages/contracts/generated/api/console/apps/types.gen.ts
# packages/contracts/generated/api/console/apps/zod.gen.ts
# packages/contracts/generated/api/openapi/orpc.gen.ts
# packages/contracts/generated/api/openapi/types.gen.ts
# packages/contracts/generated/api/openapi/zod.gen.ts
# packages/dify-ui/README.md
# pnpm-lock.yaml
# web/app/components/app/app-publisher/index.tsx
# web/app/components/app/app-publisher/sections.tsx
# web/app/components/app/create-app-modal/__tests__/index.spec.tsx
# web/app/components/app/create-app-modal/index.tsx
# web/app/components/app/duplicate-modal/__tests__/index.spec.tsx
# web/app/components/base/chip/index.tsx
# web/app/components/datasets/list/dataset-card/index.tsx
# web/app/components/datasets/list/datasets.tsx
# web/app/components/datasets/settings/form/components/basic-info-section.tsx
# web/app/components/rag-pipeline/components/rag-pipeline-header/run-mode.tsx
# web/app/components/tools/edit-custom-collection-modal/index.tsx
# web/app/components/tools/mcp/__tests__/index.spec.tsx
# web/app/components/tools/mcp/index.tsx
# web/app/components/tools/provider-list.tsx
# web/app/components/tools/workflow-tool/__tests__/configure-button.spec.tsx
2026-05-28 14:01:01 +08:00
0e1f19a380
refactor: inject tenant id in tenant-only console handlers ( #36751 )
2026-05-28 03:50:28 +00:00
d2788d7aba
feat(openapi): redesign auth pipeline with per-token-type routing ( #36693 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-27 12:45:30 +00:00
b2710b875b
refactor: use match case for draft variable serialization ( #36716 )
...
Co-authored-by: unknown <EI05187@apwx.com >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-27 09:59:28 +00:00
6464255d33
fix: fix DocumentSegment.keywords can not a valid json ( #36715 )
2026-05-27 08:42:48 +00:00
b034449a0c
refactor(api): migrate console/service_api.dataset.hit_testing to BaseModel ( #36533 )
2026-05-27 06:51:42 +00:00
6e1e0d9439
feat(openapi,cli): workspace switch + member management ( #36651 )
...
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-27 03:05:47 +00:00
f1351522ad
chore: add App type annotations to api endpoints ( #36675 )
2026-05-27 10:17:03 +08:00
53db195a91
chore: add EndUser and App type annotations to api endpoints ( #36677 )
2026-05-27 10:17:02 +08:00
63890212dd
chore: backend feature api exclude_vector_space ( #36642 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-27 10:17:02 +08:00
3469728117
chore: add InstalledApp type annotations to api endpoints ( #36678 )
2026-05-27 10:17:02 +08:00
f11869c48e
refactor(api): migrate tenant/user via DI: apikey, extension, data_source_bearer, oauth_server ( #36660 )
2026-05-27 10:17:02 +08:00
1fc93d42b4
refactor(api): migrate console tags to tenant/user via DI and improve tests ( #36658 )
...
Co-authored-by: Asuka Minato <i@asukaminato.eu.org >
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com >
2026-05-27 10:17:02 +08:00
3f4659e2ba
feat(api): Node Output Inspector service + 3 REST endpoints (Stage 4 §8) ( #36644 )
...
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-27 10:17:02 +08:00
c31869874e
chore: inject tenant id in extension handlers ( #36656 )
2026-05-27 10:17:01 +08:00
b02d8088b9
chore: inject account context in file handlers ( #36655 )
2026-05-27 10:17:01 +08:00
fed282cf3b
chore: inject tenant id in feature handlers ( #36654 )
2026-05-27 10:17:01 +08:00
68b1e9f739
chore: inject current user in explore message handlers ( #36652 )
2026-05-27 10:17:01 +08:00
6c0bbef7a7
feat: adding dify cli ( #36348 )
...
Co-authored-by: GareArc <garethcxy@dify.ai >
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: L1nSn0w <l1nsn0w@qq.com >
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com >
Co-authored-by: gigglewang <gigglewang@dify.ai >
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Co-authored-by: Xiyuan Chen <52963600+GareArc@users.noreply.github.com >
2026-05-27 10:16:10 +08:00
31a454abf7
fix: remove unused datasource_parameters from Notion pre-import query ( #36627 )
2026-05-27 10:15:22 +08:00
b37922aa5a
chore: dep inject for sql session ( #36545 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: WH-2099 <wh2099@pm.me >
2026-05-27 10:15:22 +08:00
086f148359
chore: inject current user in console handlers ( #36628 )
2026-05-27 10:15:21 +08:00
2cf03f3576
chore: example of current user id dep injection ( #36588 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-27 10:15:21 +08:00
6d6ea88d21
chore: use dify_config.BILLING_ENABLED ( #36619 )
2026-05-27 10:15:21 +08:00
7db3a521e1
fix: member invite limits with dedup, locking, and accurate new-member counting ( #36512 )
2026-05-27 10:15:21 +08:00
e0ad088657
chore: add App type annotations to api endpoints ( #36675 )
2026-05-26 15:35:48 +00:00
5dbad23c28
fix: fix miss account name
2026-05-26 18:10:22 +08:00
323b2b82e0
chore: add EndUser and App type annotations to api endpoints ( #36677 )
2026-05-26 09:43:00 +00:00
f5d664887b
chore: backend feature api exclude_vector_space ( #36642 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-26 08:50:54 +00:00
5aa24c25d9
chore: add InstalledApp type annotations to api endpoints ( #36678 )
2026-05-26 08:32:38 +00:00
eed8d659d1
refactor(api): migrate tenant/user via DI: apikey, extension, data_source_bearer, oauth_server ( #36660 )
2026-05-26 08:22:35 +00:00
59e99ee1ae
refactor(api): migrate console tags to tenant/user via DI and improve tests ( #36658 )
...
Co-authored-by: Asuka Minato <i@asukaminato.eu.org >
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com >
2026-05-26 08:20:10 +00:00
fb07b43107
feat(api): Node Output Inspector service + 3 REST endpoints (Stage 4 §8) ( #36644 )
...
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-26 07:34:33 +00:00
6813875f31
fix: fix dataset miss permission keys
2026-05-26 13:47:30 +08:00
2b97f6c8c2
chore: inject tenant id in extension handlers ( #36656 )
2026-05-26 05:45:03 +00:00
75d6511284
chore: inject account context in file handlers ( #36655 )
2026-05-26 05:43:57 +00:00
fd059720e5
chore: inject tenant id in feature handlers ( #36654 )
2026-05-26 05:36:02 +00:00
2a5f7bb1aa
chore: inject current user in explore message handlers ( #36652 )
2026-05-26 05:31:51 +00:00
a728e0ac69
feat: adding dify cli ( #36348 )
...
Co-authored-by: GareArc <garethcxy@dify.ai >
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: L1nSn0w <l1nsn0w@qq.com >
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com >
Co-authored-by: gigglewang <gigglewang@dify.ai >
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Co-authored-by: Xiyuan Chen <52963600+GareArc@users.noreply.github.com >
2026-05-26 01:12:36 +00:00
7d464d014c
fix: remove unused datasource_parameters from Notion pre-import query ( #36627 )
2026-05-26 01:05:30 +00:00
25da7ae0d9
chore: dep inject for sql session ( #36545 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: WH-2099 <wh2099@pm.me >
2026-05-25 14:24:58 +00:00
87268f0662
chore: inject current user in console handlers ( #36628 )
2026-05-25 13:14:08 +00:00
135e01930b
chore: example of current user id dep injection ( #36588 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-25 11:31:40 +00:00
d7b265eb87
feat: copy app return permission keys
2026-05-25 18:11:37 +08:00
fbfb4b3a00
chore: use dify_config.BILLING_ENABLED ( #36619 )
2026-05-25 09:41:01 +00:00
3a467d1d63
fix: member invite limits with dedup, locking, and accurate new-member counting ( #36512 )
2026-05-25 08:58:42 +00:00
78c25159c6
Merge branch 'main' into feat/rbac
2026-05-25 15:50:35 +08:00
345ba80942
fix: type mismatches (route says uuid: but handler says str) ( #36612 )
2026-05-25 07:33:32 +00:00
e617435d03
fix: replace .distinct() with .group_by(Conversation.id) for PostgreSQL JSON compatibility ( #36610 )
...
Co-authored-by: cocoon <kuishou68@users.noreply.github.com >
Co-authored-by: Asuka Minato <i@asukaminato.eu.org >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-25 07:15:24 +00:00