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

759 Commits

Author SHA1 Message Date
hj24 7a54607219 fix: raise error for unexpected account 2025-10-14 13:35:02 +08:00
hj24 ed97dce06e fix: add fast path 2025-10-13 17:20:52 +08:00
hjlarry 064075ab5f Merge branch 'feat/collaboration' into deploy/dev 2025-10-13 16:43:23 +08:00
hj24 b4d412fead fix: ci lint 2025-10-13 14:03:49 +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
屈定 44d36f2460
fix: external knowledge url check ssrf (#26789) 
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
 2025-10-13 11:19:00 +08:00
hj24 b6d9360f72 fix: use account id in workflow app log filter 2025-10-13 10:42:18 +08:00
Asuka Minato 24cd7bbc62
fix RetrievalMethod StrEnum (#26768) 
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-13 10:29:37 +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 ca0a149f06
Merge branch 'feat/memory-orchestration-be-dev-env' into deploy/dev 2025-10-11 16:28:33 +08:00
Stream db83b54a88
Merge branch 'feat/memory-orchestration-be' into feat/memory-orchestration-be-dev-env 2025-10-11 16:27:58 +08:00
Stream f4567fbf9e
fix: fix circular ref 2025-10-11 16:27:40 +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
lyzno1 f19630bcf5
Merge remote-tracking branch 'origin/main' into feat/collaboration 2025-10-11 14:43:20 +08:00
Guangdong Liu 456dbfe7d7
feat: add tracking for updated_by and updated_at fields in app models (#26736) 2025-10-11 13:48:57 +08:00
Yansong Zhang d0b99170f6 mr credit pool 2025-10-11 11:48:54 +08:00
Yansong Zhang 1d16528dff add credit next_credit_reset_date 2025-10-11 11:45:24 +08:00
Yansong Zhang c0ed353c10 add credit next_credit_reset_date 2025-10-11 11:45:18 +08:00
Yansong Zhang 26b63693aa Separate object attributes before session 2025-10-11 09:54:20 +08:00
Yansong Zhang 5883dc8876 fix: session of db 2025-10-11 09:42:41 +08:00
Yansong Zhang 3e14077e8d fix trial where condition 2025-10-11 09:27:06 +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 bb6a331490
change all to httpx (#26119) 
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-10-10 23:41:16 +08:00
Stream f6038a4557
Merge branch 'main' into feat/memory-orchestration-be 2025-10-10 18:43:59 +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
CodingOnStar 2c408445ff Merge remote-tracking branch 'origin/main' into deploy/dev 2025-10-10 10:00:50 +08:00
Asuka Minato 3c4aa24198
Refactor: Remove unnecessary casts and tighten type checking (#26625) 
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>
 2025-10-09 22:11:14 +08:00
CodingOnStar 4df606f439 fix: merge main 2025-10-09 18:26:10 +08:00
Stream c367f80ec5
Merge branch 'main' into feat/memory-orchestration-be 2025-10-09 15:01:03 +08:00
autofix-ci[bot] e056e0835a
[autofix.ci] apply automated fixes (attempt 2/3) 2025-10-09 02:51:51 +00:00
autofix-ci[bot] e1819fb7e5
[autofix.ci] apply automated fixes 2025-10-09 02:50:01 +00:00
Bowen Liang 40d35304ea
fix: check allowed file extensions in rag transform pipeline and use set type instead of list for performance in file extensions (#26593) 2025-10-09 10:21:56 +08:00
hjlarry 9b0f172f91 Merge branch 'p284' into deploy/dev 2025-10-09 09:39:06 +08:00
Charles Liu faaca822e4
fix bug 26613: get wrong credentials with multiple authorizations plugin (#26615) 
Co-authored-by: charles liu <dearcharles.liu@gmail.com>
 2025-10-07 12:49:44 +08:00
Will d89c5f7146
chore: Avoid directly using OpenAI dependencies (#26590) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2025-10-06 10:40:38 +08:00
yihong bbbb6e04cb
fix: delete useless db session commit (#26572) 
Signed-off-by: yihong0618 <zouzou0208@gmail.com>
 2025-10-05 12:43:40 +08:00
hjlarry 93b2eb3ff6 Merge remote-tracking branch 'myori/main' into p284 2025-10-04 15:28:29 +08:00
zlyszx 578b1b45ea
fix: duplicate data in datasets pagination list (#25783) 2025-09-30 11:00:10 +08:00
Stream 791f33fd0b
Merge branch 'main' into feat/memory-orchestration-be 2025-09-28 22:41:24 +08:00
Stream bb1f1a56a5
feat: update MemoryListApi response format with ChatflowConversationMetadata 2025-09-28 22:36:10 +08:00
Stream 15be85514d
fix: chatflow message visibility from index 2025-09-28 21:20:37 +08:00
Yansong Zhang c3e3a18ab4 add paid credit 2025-09-26 13:32:40 +08:00
Yansong Zhang ab34cea714 add paid credit 2025-09-26 13:32:28 +08:00
Yansong Zhang db0780cfa8 add:log 2025-09-26 13:31:54 +08:00
Yansong Zhang 2b51fc23d9 add credit pool sys 2025-09-26 13:29:31 +08:00
Yansong Zhang d745c2e8e3 add paid credit 2025-09-26 12:49:35 +08:00
Yansong Zhang e974c696f7 add paid credit 2025-09-26 12:49:26 +08:00