Commit Graph

377 Commits

Author SHA1 Message Date
aec1704ad7 Merge branch 'main' into feat/rbac 2026-06-17 09:31:34 +08:00
1b2d397fc9 test: example of make db.session pass from parameter. #37403 (#37471)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-16 04:07:01 +00:00
aa0912766a chore: update permission check 2026-06-16 10:01:54 +08:00
28b6384920 fix: fix conflict 2026-06-15 15:24:17 +08:00
b18f928e29 use enum for access 2026-06-15 11:54:11 +08:00
5d77c0af08 refactor: fix OpenAPI contract generation schemas (#37387)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-12 14:25:53 +00:00
5d2de9f0fb feat: add new apis 2026-06-12 17:01:46 +08:00
e0c6ca9930 fix: GET query parameter OpenAPI contracts (#37378)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-12 09:01:22 +00:00
535257dba0 chore: update permission check 2026-06-12 10:44:49 +08:00
ba5cbc03ef fix: fix type check 2026-06-11 15:59:50 +08:00
eb3a4964b6 [autofix.ci] apply automated fixes 2026-06-11 06:18:25 +00:00
53ef2e0e90 fix: fix apps and dataset permission 2026-06-11 14:13:36 +08:00
fe853fe280 fix: fix app and dataset permission keys 2026-06-11 11:40:47 +08:00
fe7d9f82f8 Merge branch 'main' into feat/rbac 2026-06-11 10:11:38 +08:00
2a46a7d91d refactor(api): migrate remaining console APIs to use injected user/tenant (#37288) 2026-06-11 01:30:31 +00:00
da1819e0da Merge branch 'main' into feat/rbac 2026-06-10 18:33:42 +08:00
4fb3210f9a fix: validate conversation variable description length to prevent varchar(255) truncation error (#33038)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: 非法操作 <hjlarry@163.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
2026-06-10 07:28:12 +00:00
d2f1287127 chore: remove some check 2026-06-10 12:34:26 +08:00
d849d60822 refactor(api): migrate tenant/user via DI for several endpoints (#37240) 2026-06-10 04:11:53 +00:00
e0408f43fe fix: fix failed test 2026-06-10 11:35:24 +08:00
4f5f482c36 [autofix.ci] apply automated fixes 2026-06-10 03:09:24 +00:00
cbec0417c4 fix: fix type check 2026-06-10 11:04:26 +08:00
f161083146 [autofix.ci] apply automated fixes 2026-06-10 02:14:08 +00:00
00ab2dfebf fix: fix type check 2026-06-10 10:09:18 +08:00
cc061d66bc [autofix.ci] apply automated fixes 2026-06-10 01:44:01 +00:00
935c51c7a3 fix: fix permission key 2026-06-09 23:01:43 +08:00
ed8fba4fe1 chore: skip permission check 2026-06-09 18:07:30 +08:00
f4e285ba0c fix: fix create dataset permission 2026-06-09 17:40:09 +08:00
82d717dc76 chore: change create dataset permission 2026-06-09 16:19:25 +08:00
f0fa3e5dc1 feat: add rbac_permission_required decorator 2026-06-08 21:04:20 +08:00
6071fb8bda Merge branch 'main' into feat/rbac 2026-06-08 10:43:43 +08:00
6b12152ce8 refactor(api): migrate tenant/user via DI for several endpoints (#37114)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-05 15:08:11 +00:00
4af953d86b Merge branch 'main' into feat/rbac 2026-06-05 10:26:17 +08:00
b67c3a5f76 refactor(api): migrate tenant/user via DI for several endpoints (#37026) 2026-06-04 05:52:59 +00:00
18ffe5e8d8 Merge branch 'main' into feat/rbac 2026-06-04 09:49:06 +08:00
d3058d63bd refactor(api): migrate console.datasets.data_source to BaseModel (#36624) 2026-06-03 19:38:39 +00:00
4fc62d3b38 refactor(api): migrate console.datasets.rag_pipeline partially to BaseModel (#36649) 2026-06-03 17:44:10 +00:00
600b47721f Merge remote-tracking branch 'upstream/main' into feat/rbac 2026-06-03 13:16:30 +08:00
1b972c4e09 refactor(api): migrate tenant/user via DI for several endpoints (#36971)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-03 04:24:17 +00:00
b48d321d95 Merge branch 'main' into feat/rbac 2026-06-03 11:00:36 +08:00
55afd99bec feat: legacy return permission keys 2026-06-02 18:07:28 +08:00
86497045c9 feat: per-credential visibility control for plugin credentials (#35468)
Co-authored-by: Yang <yang@Yangs-MacBook-Pro.local>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-06-01 05:56:18 +00:00
0a3005701f refactor: inject current user into user-only controllers (#36754)
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
2026-05-31 15:03:15 +00:00
599960024d refactor(api): migrate console/service_api.dataset.document to BaseModel (#36506)
Co-authored-by: WH-2099 <wh2099@pm.me>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-30 14:38:27 +00:00
928f888ef5 refactor(api): migrate console/service_api.dataset.segment to BaseModel (#36522)
Co-authored-by: WH-2099 <wh2099@pm.me>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-30 13:54:01 +00:00
c1c48a02dc Merge branch 'main' into feat/rbac 2026-05-29 10:17:38 +08:00
f5ab5e7eb3 fix: fix cannot extract elements from a scalar (#36769) 2026-05-28 07:31:36 +00: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
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