YungLe
272f11770e
Merge branch 'main' into feat/dataset-api-key-scope
2026-06-23 18:21:21 +09:00
Rohit Gahlawat
9b4dd9d4e8
refactor: accept db.session explicitly in APIBasedExtensionService ( #37693 )
2026-06-21 00:53:36 +00:00
Asuka Minato
a7b53b33ee
chore: move one db.session ( #37656 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-19 19:52:59 +00:00
yungle246
1edffca717
Merge remote-tracking branch 'upstream/main' into feat/dataset-api-key-scope
...
# Conflicts:
# web/app/components/datasets/extra-info/api-access/__tests__/card.spec.tsx
# web/app/components/datasets/extra-info/api-access/card.tsx
# web/app/components/develop/secret-key/secret-key-modal.tsx
2026-06-20 03:16:09 +09:00
Asuka Minato
fae607e2fe
chore: add Type to test ( #37191 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-19 16:44:20 +00:00
yungle246
940686b731
fix: resolve CI failures after merging main
...
- Migration: rebase dataset_id migration onto current head (d2f1a4b8c3e0)
instead of 7bad07dc267d, which had become a second head after upstream
merged 0b2f2c8a9d1e; restores a single Alembic head.
- Integration test: capture dataset ids into locals before the commit that
expires the instances, fixing a DetachedInstanceError in
test_list_excludes_keys_bound_to_other_datasets.
- Web test: add the new useDatasetScopedApiKeys export to the use-dataset mock
in api-key-management-flow.test.tsx (SecretKeyModal now calls it).
2026-06-18 14:20:18 +09:00
YungLe
d2d4e54b11
Merge remote-tracking branch 'upstream/main' into feat/dataset-api-key-scope
2026-06-17 16:45:13 +09:00
yungle246
be6612f454
feat: allow knowledge base API keys to be scoped to a single dataset
...
Reintroduce the nullable api_tokens.dataset_id column (dropped in 2e9819ca5b28)
so dataset API keys can opt into per-knowledge-base scoping:
- NULL dataset_id keeps today's workspace-wide behavior, so every existing key
and the existing /datasets/api-keys create route are unchanged.
- validate_dataset_token rejects a bound key for any other dataset, and for
endpoints that carry no dataset id (e.g. list-all), with 403.
- CachedApiToken carries dataset_id with a None default so cache entries
written before deploy keep deserializing.
- The per-dataset console routes in apikey.py (previously dead code that 500ed
on a missing ApiToken.dataset_id) now create bound keys; their list returns
bound keys plus workspace keys so the dataset page shows the full access
picture.
- Frontend: the knowledge base API access popover gains an API keys entry; the
secret key modal accepts datasetId, shows a scope column, and offers a
workspace / this-knowledge-base scope choice on create. New strings are
localized for all 23 locales.
2026-06-11 11:41:47 +09:00
chariri
2a46a7d91d
refactor(api): migrate remaining console APIs to use injected user/tenant ( #37288 )
2026-06-11 01:30:31 +00:00
Novice
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
chariri
d849d60822
refactor(api): migrate tenant/user via DI for several endpoints ( #37240 )
2026-06-10 04:11:53 +00:00
Asuka Minato
d11e4eeaf7
chore: DI current_user && use inspect ( #37084 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-06-09 05:06:28 +00:00
chariri
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
chariri
b67c3a5f76
refactor(api): migrate tenant/user via DI for several endpoints ( #37026 )
2026-06-04 05:52:59 +00:00
chariri
d3058d63bd
refactor(api): migrate console.datasets.data_source to BaseModel ( #36624 )
2026-06-03 19:38:39 +00:00
chariri
4fc62d3b38
refactor(api): migrate console.datasets.rag_pipeline partially to BaseModel ( #36649 )
2026-06-03 17:44:10 +00:00
chariri
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
Escape0707
5658065b97
test: satisfy strict pyrefly for migrated container tests ( #36791 )
2026-06-01 11:09:40 +00:00
YungLe
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
Tianle
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
chariri
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
Escape0707
678260e34e
test: migrate workspace members tests to containers ( #36738 )
...
Co-authored-by: jamesrayammons <63717587+jamesrayammons@users.noreply.github.com>
2026-05-28 06:01:05 +00:00
chariri
eed8d659d1
refactor(api): migrate tenant/user via DI: apikey, extension, data_source_bearer, oauth_server ( #36660 )
2026-05-26 08:22:35 +00:00
chariri
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
Asuka Minato
7ecbed3b04
chore: add Type to test ( #36454 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-21 19:25:03 +00:00
chariri
ea5e487d3c
fix(api): stop returning 204 with response body and add CI check ( #36489 )
2026-05-21 16:20:34 +00:00
yyh
04d62867af
feat(dify-ui): add shared form primitives ( #36334 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-19 05:38:57 +00:00
Asuka Minato
76bba64b79
chore: add type to test ( #36324 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-18 08:47:47 +00:00
chariri
2eb37caf2e
refactor(api): migrate console.app.workflow to BaseModel ( #36216 )
...
Co-authored-by: WH-2099 <wh2099@pm.me>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-18 07:31:37 +00:00
yyh
a252fbddfa
feat: initialize user timezone and language from browser ( #36170 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-15 08:12:52 +00:00
Tim Ren
55d05fe52d
fix(security): enforce tenant scoping on app trace-config endpoints (GHSA-48xc-wmw8-3jr3) ( #35793 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Ido Shani <ido@zafran.io>
Co-authored-by: -LAN- <laipz8200@outlook.com>
2026-05-14 15:59:31 +00:00
QuantumGhost
74a04afe27
chore(api): upgrade graphon to v0.3.1 ( #35987 )
...
Co-authored-by: -LAN- <laipz8200@outlook.com>
2026-05-11 05:32:17 +00:00
chariri
4a56763d2f
refactor(api): migrate console.app.workflow etc. to BaseModel ( #35967 )
2026-05-09 08:34:15 +00:00
Asuka Minato
ecd830083a
test: add type to test ( #35871 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-08 01:06:25 +00:00
Asuka Minato
8fd616d27f
refactor: add type to test ( #30873 )
...
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-05-07 03:46:23 +00:00
hyl64
ceec00e172
fix: accept icon type in app icon updates ( #35360 )
...
Co-authored-by: Stephen Zhou <hi@hyoban.cc>
2026-04-20 02:33:49 +00:00
Yunlu Wen
3193e8a712
chore: reorg imports ( #35308 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-16 08:50:02 +00:00
Tim Ren
e6b5923ff1
test(types): replace Account/Tenant status string literals with enum values ( #35267 )
...
Co-authored-by: xr843 <xianren843@protonmail.com>
2026-04-15 15:52:38 +00:00
非法操作
7a880ae60c
fix: import DSL and copy app not work ( #35239 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-15 04:43:22 +00:00
NVIDIAN
25c388d0db
refactor(api): migrate console workflow-trigger responses to BaseModel ( #35200 )
...
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
2026-04-14 19:52:17 +00:00
NVIDIAN
b1df52b8ff
refactor(api): migrate console workflow app-log responses to BaseModel ( #35201 )
...
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
2026-04-14 18:43:09 +00:00
bohdansolovie
381c518b23
test: migrate conversation read timestamp SQL test to Testcontainers ( #32454 ) ( #35177 )
2026-04-14 14:19:19 +00:00
NVIDIAN
a3170f744c
refactor: migrate app site from marshal_with/api.model to Pydantic BaseModel ( #34933 )
...
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
2026-04-13 05:18:16 +00:00
wangxiaolei
bcd738d2e6
fix: fix orm_exc.DetachedInstanceError ( #34904 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-10 07:13:59 +00:00
aliworksx08
396b39dff9
refactor: migrate session.query to select API in console controllers ( #34607 )
2026-04-07 04:19:30 +00:00
Desel72
dbdbb098d5
refactor: use sessionmaker().begin() in console workspace and misc co… ( #34284 )
2026-03-31 14:28:05 +00:00
Desel72
cf50d7c7b5
refactor: use sessionmaker().begin() in console app controllers ( #34282 )
...
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
2026-03-31 13:10:16 +00:00
Desel72
d9a0665b2c
refactor: use sessionmaker().begin() in console datasets controllers ( #34283 )
2026-03-31 13:09:18 +00:00
Desel72
b818cc0766
test: migrate apikey controller tests to testcontainers ( #34286 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-03-31 13:06:42 +00:00
YBoy
1063e021f2
test: migrate explore conversation controller tests to testcontainers ( #34312 )
2026-03-31 05:00:22 +00:00