opensource
/
dify
mirror of https://github.com/langgenius/dify.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,995 Commits 288 Branches 160 Tags 497 MiB
Commit Graph

336 Commits

Author SHA1 Message Date
Novice 4cb42499ae
Merge branch 'feat/mcp-06-18' into deploy/dev 2025-10-14 21:42:21 +08:00
Yansong Zhang 7877706b5f add app mode for message 2025-10-14 16:42:30 +08:00
hjlarry 064075ab5f Merge branch 'feat/collaboration' into deploy/dev 2025-10-13 16:43:23 +08:00
Novice a538f80e95
Merge branch 'main' into feat/mcp-06-18 2025-10-13 13:54:01 +08:00
lyzno1 67762cf1d8
chore: resolve merge conflict in pnpm-lock.yaml 
Merged origin/main into feat/collaboration and resolved dependency lock file conflicts by regenerating pnpm-lock.yaml through clean install.

Changes:
- Resolved eslint version differences (9.36.0 vs 9.35.0)
- Updated lock file reflects current dependency resolution
- All other changes from main branch successfully merged
 2025-10-13 11:53:43 +08:00
hjlarry 9fc2a0a3a1 Merge branch 'feat/collaboration' into deploy/dev 2025-10-13 10:16:39 +08:00
Asuka Minato 0a56d65581
Issue 23579 (#26777) 
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
 2025-10-13 10:16:12 +08:00
Stream 05751ac492
Merge branch 'feat/memory-orchestration-be-dev-env' into deploy/dev 2025-10-11 16:16:15 +08:00
Stream 1a4600ce77
Merge remote-tracking branch 'origin/deploy/dev' into feat/memory-orchestration-be-dev-env 
# Conflicts:
#	api/models/__init__.py
#	api/uv.lock
 2025-10-11 15:01:26 +08:00
Yansong Zhang 27e8a076ff add: language for banner 2025-10-11 14:54:14 +08:00
lyzno1 f19630bcf5
Merge remote-tracking branch 'origin/main' into feat/collaboration 2025-10-11 14:43:20 +08:00
Asuka Minato 1bd621f819
remove .value (#26633) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
 2025-10-11 09:08:29 +08:00
Asuka Minato 3922ad876f
part of add type to orm (#26262) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2025-10-10 23:40:54 +08:00
Stream f6038a4557
Merge branch 'main' into feat/memory-orchestration-be 2025-10-10 18:43:59 +08:00
诗浓 94a07706ec
fix: restore None guards for _environment_variables/_conversation_variables getters (#25633) 2025-10-10 16:32:09 +08:00
Asuka Minato ab2eacb6c1
use model_validate (#26182) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
 2025-10-10 17:30:13 +09:00
Asuka Minato 8a2b208299
Refactor account models to use SQLAlchemy 2.0 dataclass mapping (#26415) 
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
 2025-10-10 17:12:12 +09:00
Novice 841b7fa7ce
Merge branch 'main' into feat/mcp-06-18 2025-10-10 10:53:15 +08:00
hjlarry 9b0f172f91 Merge branch 'p284' into deploy/dev 2025-10-09 09:39:06 +08:00
hjlarry 93b2eb3ff6 Merge remote-tracking branch 'myori/main' into p284 2025-10-04 15:28:29 +08:00
Stream 791f33fd0b
Merge branch 'main' into feat/memory-orchestration-be 2025-09-28 22:41:24 +08:00
Stream 1e0a3b163e
refactor: fix ruff 2025-09-28 22:41:07 +08:00
Stream 15be85514d
fix: chatflow message visibility from index 2025-09-28 21:20:37 +08:00
Yansong Zhang c41140d654 add credit pool sys 2025-09-26 10:45:24 +08:00
Asuka Minato 25c69ac540
one example of Session (#24135) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
 2025-09-24 03:32:48 +08:00
Stream b7b5b0b8d0
Merge branch 'main' into feat/memory-orchestration-be 2025-09-23 17:43:52 +08:00
Stream 6eab6a675c
feat: add created_by to memory blocks 2025-09-23 17:35:36 +08:00
Jyong 0c4193bd91
fix avatar-url to text (#26068) 2025-09-22 21:28:42 +08:00
hjlarry c662b95b80 Merge branch 'p284' into deploy/dev 2025-09-22 18:03:09 +08:00
Stream e9313b9c1b
Merge branch 'main' into feat/memory-orchestration-be 
# Conflicts:
#	api/core/app/apps/advanced_chat/app_runner.py
#	api/core/workflow/constants.py
#	api/core/workflow/entities/variable_pool.py
#	api/core/workflow/nodes/llm/node.py
#	api/models/workflow.py
 2025-09-22 14:46:30 +08:00
Yansong Zhang e59cc3311d add: trial api and trial table 2025-09-22 13:42:22 +08:00
Yongtao Huang 5bc6e8a433
Fix: correct regex for file-preview URL re-signing (#25620) 
Fixes #25619

The regex patterns for file-preview and image-preview contained an unescaped `?`, 
which caused incorrect matches such as `file-previe` or `image-previw`. 
This led to malformed URLs being incorrectly re-signed.

Changes:
- Escape `?` in both file-preview and image-preview regex patterns.
- Ensure only valid URLs are re-signed.

Added unit tests to cover:
- Valid file-preview and image-preview URLs (correctly re-signed).
- Misspelled file/image preview URLs (no longer incorrectly matched).

Other:
- Fix a deprecated function `datetime.utcnow()`

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: crazywoola <100913391+crazywoola@users.noreply.github.com>
 2025-09-22 10:58:29 +08:00
hjlarry 81c6e52401 Merge remote-tracking branch 'origin/p254' into p284 2025-09-18 15:14:55 +08:00
-LAN- 85cda47c70
feat: knowledge pipeline (#25360) 
Signed-off-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: twwu <twwu@dify.ai>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
Co-authored-by: jyong <718720800@qq.com>
Co-authored-by: Wu Tianwei <30284043+WTW0313@users.noreply.github.com>
Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com>
Co-authored-by: lyzno1 <yuanyouhuilyz@gmail.com>
Co-authored-by: quicksand <quicksandzn@gmail.com>
Co-authored-by: Jyong <76649700+JohnJyong@users.noreply.github.com>
Co-authored-by: lyzno1 <92089059+lyzno1@users.noreply.github.com>
Co-authored-by: zxhlyh <jasonapring2015@outlook.com>
Co-authored-by: Yongtao Huang <yongtaoh2022@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Joel <iamjoel007@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: nite-knite <nkCoding@gmail.com>
Co-authored-by: Hanqing Zhao <sherry9277@gmail.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Harry <xh001x@hotmail.com>
 2025-09-18 12:49:10 +08:00
Novice 0c3aa8f5ec Merge branch 'main' into feat/mcp-06-18 2025-09-16 17:09:46 +08:00
Novice aed9955105 refactor(mcp): clean the client service code 2025-09-16 10:54:31 +08:00
Stream e3903f34e4
refactor: add version field to ChatflowMemoryVariable table 2025-09-15 19:27:41 +08:00
Stream 516b6b0fa8
refactor: use VersionedMemoryVariable in creation of WorkflowDraftVariable instead of StringVariable 2025-09-15 15:39:38 +08:00
Stream d6d9554954
fix: fix basedpyright errors 2025-09-15 14:20:30 +08:00
Stream 2a532ab729
Merge branch 'main' into feat/memory-orchestration-be 
# Conflicts:
#	api/core/app/apps/advanced_chat/app_runner.py
#	api/core/prompt/entities/advanced_prompt_entities.py
#	api/core/variables/segments.py
 2025-09-15 14:14:56 +08:00
Stream ab389eaa8e
fix: fix ruff 2025-09-15 14:00:53 +08:00
-LAN- bab4975809
chore: add ast-grep rule to convert Optional[T] to T | None (#25560) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2025-09-15 13:06:33 +08:00
Krito. a13d7987e0
chore: adopt StrEnum and auto() for some string-typed enums (#25129) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
 2025-09-12 21:14:26 +08:00
Yeuoly ec808f3fe8
refactor: centralize default end user session ID constant (#25416) 
This PR refactors the handling of the default end user session ID by centralizing it as an enum in the models module where the `EndUser` model is defined. This improves code organization and makes the relationship between the constant and the model clearer.

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
 2025-09-12 10:27:16 +08:00
QuantumGhost 874406d934
security(api): fix privilege escalation vulnerability in model config and chat message APIs (#25518) 
The `ChatMessageApi` (`POST /console/api/apps/{app_id}/chat-messages`) and 
`ModelConfigResource` (`POST /console/api/apps/{app_id}/model-config`) 
endpoints do not properly validate user permissions, allowing users without `editor` 
permission to access restricted functionality.

This PR addresses this issue by adding proper permission check.
 2025-09-11 14:53:35 +08:00
hjlarry 21fee59b22 use new features update api 2025-09-10 14:24:38 +08:00
Asuka Minato cbc0e639e4
update sql in batch (#24801) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
 2025-09-10 13:00:17 +08:00
Asuka Minato 649242f82b
example of uuid (#25380) 
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2025-09-09 10:45:08 +08:00
Cluas f891c67eca
feat: add MCP server headers support #22718 (#24760) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
Co-authored-by: Novice <novice12185727@gmail.com>
 2025-09-08 14:10:55 +08:00
-LAN- 9b8a03b53b
[Chore/Refactor] Improve type annotations in models module (#25281) 
Signed-off-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
 2025-09-08 09:42:27 +08:00