twwu
85fd97e090
Merge branch 'main' into feat/rag-2
2025-08-25 15:30:18 +08:00
-LAN-
da9af7b547
[Chore/Refactor] Use centralized naive_utc_now for UTC datetime operations ( #24352 )
...
autofix.ci / autofix (push) Waiting to run
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/amd64, build-api-amd64) (push) Waiting to run
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/arm64, build-api-arm64) (push) Waiting to run
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/amd64, build-web-amd64) (push) Waiting to run
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/arm64, build-web-arm64) (push) Waiting to run
Build and Push API & Web / create-manifest (api, DIFY_API_IMAGE_NAME, merge-api-images) (push) Blocked by required conditions
Build and Push API & Web / create-manifest (web, DIFY_WEB_IMAGE_NAME, merge-web-images) (push) Blocked by required conditions
Signed-off-by: -LAN- <laipz8200@outlook.com >
2025-08-22 23:53:05 +08:00
twwu
8c44151e6f
Merge branch 'main' into feat/rag-2
2025-08-22 17:40:34 +08:00
Yongtao Huang
106ab7f2a8
Fix: safe defaults for BaseModel dict fields ( #24098 )
...
Co-authored-by: Yongtao Huang <99629139+hyongtao-db@users.noreply.github.com >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-08-21 21:38:55 +08:00
jyong
22b3933cc3
Merge branch 'main' into feat/rag-2
...
# Conflicts:
# api/core/workflow/entities/variable_pool.py
2025-08-12 11:13:04 +08:00
-LAN-
577062b93a
refactor: simplify variable pool key structure and improve type safety ( #23732 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com >
2025-08-11 18:10:04 +08:00
zxhlyh
a95cf6f8b0
merge main
2025-07-28 16:00:38 +08:00
Asuka Minato
a189d293f8
make logging not use f-str, change others to f-str ( #22882 )
2025-07-25 10:32:48 +08:00
twwu
5b2c99e183
Merge branch 'main' into feat/rag-2
2025-07-18 14:03:48 +08:00
-LAN-
460a825ef1
refactor: decouple Node and NodeData ( #22581 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com >
Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com >
2025-07-18 10:08:51 +08:00
zxhlyh
01566035e3
merge main
2025-07-17 16:48:43 +08:00
QuantumGhost
2c1ab4879f
refactor(api): Separate SegmentType for Integer/Float to Enable Pydantic Serialization ( #22025 )
...
refactor(api): Separate SegmentType for Integer/Float to Enable Pydantic Serialization (#22025 )
This PR addresses serialization issues in the VariablePool model by separating the `value_type` tags for `IntegerSegment`/`FloatSegment` and `IntegerVariable`/`FloatVariable`. Previously, both Integer and Float types shared the same `SegmentType.NUMBER` tag, causing conflicts during serialization.
Key changes:
- Introduce distinct `value_type` tags for Integer and Float segments/variables
- Add `VariableUnion` and `SegmentUnion` types for proper type discrimination
- Leverage Pydantic's discriminated union feature for seamless serialization/deserialization
- Enable accurate serialization of data structures containing these types
Closes #22024 .
2025-07-16 12:31:37 +08:00
twwu
682b65034c
Merge branch 'main' into feat/rag-2
2025-07-14 11:17:42 +08:00
湛露先生
edf5fd28c9
update worklow events logs. ( #19871 )
...
Signed-off-by: zhanluxianshen <zhanluxianshen@163.com >
2025-07-10 14:21:34 +08:00
twwu
9e44f2b805
Merge branch 'main' into feat/rag-2
2025-07-09 15:54:57 +08:00
-LAN-
8f723697ef
refactor(graph_engine): Take GraphRuntimeState out of GraphEngine ( #21882 )
2025-07-07 13:15:18 +08:00
jyong
e23d7e39ec
Merge branch 'feat/datasource' into feat/r2
...
# Conflicts:
# api/services/rag_pipeline/rag_pipeline.py
# web/app/components/workflow/constants.ts
# web/app/components/workflow/header/run-and-history.tsx
# web/app/components/workflow/hooks/use-nodes-interactions.ts
# web/app/components/workflow/hooks/use-workflow-interactions.ts
# web/app/components/workflow/hooks/use-workflow.ts
# web/app/components/workflow/index.tsx
# web/app/components/workflow/nodes/_base/components/panel-operator/panel-operator-popup.tsx
# web/app/components/workflow/nodes/_base/panel.tsx
# web/app/components/workflow/nodes/code/use-config.ts
# web/app/components/workflow/nodes/llm/default.ts
# web/app/components/workflow/panel/index.tsx
# web/app/components/workflow/panel/version-history-panel/index.tsx
# web/app/components/workflow/store/workflow/index.ts
# web/app/components/workflow/types.ts
# web/config/index.ts
# web/types/workflow.ts
2025-07-02 14:01:59 +08:00
jyong
540096a8d8
Merge branch 'main' into feat/r2
...
# Conflicts:
# api/core/plugin/impl/oauth.py
# api/core/workflow/entities/variable_pool.py
# api/models/workflow.py
# api/services/dataset_service.py
2025-06-25 14:35:23 +08:00
QuantumGhost
268da31332
fix(api): adding variable to variable pool recursively while loading draft variables. ( #21478 )
...
This PR fix the issue that `ObjectSegment` are not recursively added to the draft variable pool while loading draft variables from database. It also fixes an issue about loading variables with more than two elements in the its selector.
Enhances #19735 .
Closes #21477 .
2025-06-25 12:39:22 +08:00
QuantumGhost
10b738a296
feat: Persist Variables for Enhanced Debugging Workflow ( #20699 )
...
This pull request introduces a feature aimed at improving the debugging experience during workflow editing. With the addition of variable persistence, the system will automatically retain the output variables from previously executed nodes. These persisted variables can then be reused when debugging subsequent nodes, eliminating the need for repetitive manual input.
By streamlining this aspect of the workflow, the feature minimizes user errors and significantly reduces debugging effort, offering a smoother and more efficient experience.
Key highlights of this change:
- Automatic persistence of output variables for executed nodes.
- Reuse of persisted variables to simplify input steps for nodes requiring them (e.g., `code`, `template`, `variable_assigner`).
- Enhanced debugging experience with reduced friction.
Closes #19735 .
2025-06-24 09:05:29 +08:00
Dongyu Li
b77081a19e
feat(datasource): update datasource icon
2025-06-23 15:57:37 +08:00
jyong
f7fbded8b9
Merge branch 'main' into feat/r2
2025-06-19 13:32:07 +08:00
-LAN-
879f839d75
refactor(graph_engine): Merge duplicated if block ( #20784 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com >
2025-06-18 14:33:29 +08:00
jyong
f7a4e5d1a6
Merge branch 'main' into feat/r2
2025-06-18 10:57:44 +08:00
Dongyu Li
739ebf2117
feat(datasource): change datasource result type to event-stream
2025-06-17 18:24:09 +08:00
-LAN-
0dcacdf83d
feat: add a flask_context_manager. ( #21061 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com >
2025-06-17 16:31:29 +08:00
Dongyu Li
c5976f5a09
feat(datasource): change datasource result type to event-stream
2025-06-17 13:51:41 +08:00
jyong
41fef8a21f
r2
2025-06-16 13:48:43 +08:00
jyong
9cdd2cbb27
r2
2025-06-03 19:02:57 +08:00
jyong
309fffd1e4
Merge branch 'main' into feat/r2
...
# Conflicts:
# api/core/repositories/sqlalchemy_workflow_node_execution_repository.py
# api/core/workflow/entities/node_entities.py
# api/core/workflow/enums.py
2025-06-03 18:56:49 +08:00
-LAN-
72fdafc180
refactor: Replaces direct DB session usage with context managers ( #20569 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com >
2025-06-03 16:16:06 +08:00
-LAN-
a6ea15e63c
Refactor/message cycle manage and knowledge retrieval ( #20460 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com >
2025-05-30 14:36:44 +08:00
-LAN-
32e779eef3
refactor(workflow): Rename NodeRunMetadataKey to WorkflowNodeExecutionMetadataKey ( #20457 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com >
2025-05-30 04:47:56 +08:00
-LAN-
482e50aae9
Refactor/remove db from cycle manager ( #20455 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com >
2025-05-30 04:34:13 +08:00
jyong
a025db137d
Merge branch 'main' into feat/r2
2025-05-29 09:54:28 +08:00
jyong
7f59ffe7af
r2
2025-05-28 17:56:04 +08:00
-LAN-
f233a64eb5
fix(workflow): fetch user failed when workflow run in parallel mode ( #20321 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com >
2025-05-27 22:41:07 +08:00
jyong
6d547447d3
r2
2025-05-23 19:30:48 +08:00
Bowen Liang
cbc8ebd8f5
chore: bump pydantic to 2.11 and pydantic-settings to 2.9 ( #15049 )
2025-05-08 17:39:51 +08:00
Yongtao Huang
5d72003ebb
Remove dead code ( #17899 )
2025-04-11 20:33:52 +08:00
-LAN-
ec29bcf013
feat(graph_engine): yield control to other threads before node run. ( #17689 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com >
2025-04-09 17:02:47 +08:00
Novice
fe0d932f50
fix: fail-branch stream output error ( #13401 )
...
Co-authored-by: Novice Lee <novicelee@NoviPro.local >
2025-03-17 19:35:37 +08:00
jiangbo721
5646442931
fix: iteration total tokens calculate error ( #15813 )
...
Co-authored-by: 刘江波 <jiangbo721@163.com >
2025-03-14 17:44:24 +08:00
Novice
778861f461
fix: agent node can't use in parallel ( #15047 )
2025-03-06 13:13:24 +08:00
Wood
2c17bb2c36
Feature/newnew workflow loop node ( #14863 )
...
Co-authored-by: arkunzz <4873204@qq.com >
2025-03-05 17:41:15 +08:00
Novice
24d80000ac
chore: Restore the parts that were overwritten during conflict resolution. ( #14141 )
2025-03-04 11:21:16 +08:00
Yeuoly
403e2d58b9
Introduce Plugins ( #13836 )
...
Signed-off-by: yihong0618 <zouzou0208@gmail.com >
Signed-off-by: -LAN- <laipz8200@outlook.com >
Signed-off-by: xhe <xw897002528@gmail.com >
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: takatost <takatost@gmail.com >
Co-authored-by: kurokobo <kuro664@gmail.com >
Co-authored-by: Novice Lee <novicelee@NoviPro.local >
Co-authored-by: zxhlyh <jasonapring2015@outlook.com >
Co-authored-by: AkaraChen <akarachen@outlook.com >
Co-authored-by: Yi <yxiaoisme@gmail.com >
Co-authored-by: Joel <iamjoel007@gmail.com >
Co-authored-by: JzoNg <jzongcode@gmail.com >
Co-authored-by: twwu <twwu@dify.ai >
Co-authored-by: Hiroshi Fujita <fujita-h@users.noreply.github.com >
Co-authored-by: AkaraChen <85140972+AkaraChen@users.noreply.github.com >
Co-authored-by: NFish <douxc512@gmail.com >
Co-authored-by: Wu Tianwei <30284043+WTW0313@users.noreply.github.com >
Co-authored-by: 非法操作 <hjlarry@163.com >
Co-authored-by: Novice <857526207@qq.com >
Co-authored-by: Hiroki Nagai <82458324+nagaihiroki-git@users.noreply.github.com >
Co-authored-by: Gen Sato <52241300+halogen22@users.noreply.github.com >
Co-authored-by: eux <euxuuu@gmail.com >
Co-authored-by: huangzhuo1949 <167434202+huangzhuo1949@users.noreply.github.com >
Co-authored-by: huangzhuo <huangzhuo1@xiaomi.com >
Co-authored-by: lotsik <lotsik@mail.ru >
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com >
Co-authored-by: nite-knite <nkCoding@gmail.com >
Co-authored-by: Jyong <76649700+JohnJyong@users.noreply.github.com >
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: gakkiyomi <gakkiyomi@aliyun.com >
Co-authored-by: CN-P5 <heibai2006@gmail.com >
Co-authored-by: CN-P5 <heibai2006@qq.com >
Co-authored-by: Chuehnone <1897025+chuehnone@users.noreply.github.com >
Co-authored-by: yihong <zouzou0208@gmail.com >
Co-authored-by: Kevin9703 <51311316+Kevin9703@users.noreply.github.com >
Co-authored-by: -LAN- <laipz8200@outlook.com >
Co-authored-by: Boris Feld <lothiraldan@gmail.com >
Co-authored-by: mbo <himabo@gmail.com >
Co-authored-by: mabo <mabo@aeyes.ai >
Co-authored-by: Warren Chen <warren.chen830@gmail.com >
Co-authored-by: JzoNgKVO <27049666+JzoNgKVO@users.noreply.github.com >
Co-authored-by: jiandanfeng <chenjh3@wangsu.com >
Co-authored-by: zhu-an <70234959+xhdd123321@users.noreply.github.com >
Co-authored-by: zhaoqingyu.1075 <zhaoqingyu.1075@bytedance.com >
Co-authored-by: 海狸大師 <86974027+yenslife@users.noreply.github.com >
Co-authored-by: Xu Song <xusong.vip@gmail.com >
Co-authored-by: rayshaw001 <396301947@163.com >
Co-authored-by: Ding Jiatong <dingjiatong@gmail.com >
Co-authored-by: Bowen Liang <liangbowen@gf.com.cn >
Co-authored-by: JasonVV <jasonwangiii@outlook.com >
Co-authored-by: le0zh <newlight@qq.com >
Co-authored-by: zhuxinliang <zhuxinliang@didiglobal.com >
Co-authored-by: k-zaku <zaku99@outlook.jp >
Co-authored-by: luckylhb90 <luckylhb90@gmail.com >
Co-authored-by: hobo.l <hobo.l@binance.com >
Co-authored-by: jiangbo721 <365065261@qq.com >
Co-authored-by: 刘江波 <jiangbo721@163.com >
Co-authored-by: Shun Miyazawa <34241526+miya@users.noreply.github.com >
Co-authored-by: EricPan <30651140+Egfly@users.noreply.github.com >
Co-authored-by: crazywoola <427733928@qq.com >
Co-authored-by: sino <sino2322@gmail.com >
Co-authored-by: Jhvcc <37662342+Jhvcc@users.noreply.github.com >
Co-authored-by: lowell <lowell.hu@zkteco.in >
Co-authored-by: Boris Polonsky <BorisPolonsky@users.noreply.github.com >
Co-authored-by: Ademílson Tonato <ademilsonft@outlook.com >
Co-authored-by: Ademílson Tonato <ademilson.tonato@refurbed.com >
Co-authored-by: IWAI, Masaharu <iwaim.sub@gmail.com >
Co-authored-by: Yueh-Po Peng (Yabi) <94939112+y10ab1@users.noreply.github.com >
Co-authored-by: Jason <ggbbddjm@gmail.com >
Co-authored-by: Xin Zhang <sjhpzx@gmail.com >
Co-authored-by: yjc980121 <3898524+yjc980121@users.noreply.github.com >
Co-authored-by: heyszt <36215648+hieheihei@users.noreply.github.com >
Co-authored-by: Abdullah AlOsaimi <osaimiacc@gmail.com >
Co-authored-by: Abdullah AlOsaimi <189027247+osaimi@users.noreply.github.com >
Co-authored-by: Yingchun Lai <laiyingchun@apache.org >
Co-authored-by: Hash Brown <hi@xzd.me >
Co-authored-by: zuodongxu <192560071+zuodongxu@users.noreply.github.com >
Co-authored-by: Masashi Tomooka <tmokmss@users.noreply.github.com >
Co-authored-by: aplio <ryo.091219@gmail.com >
Co-authored-by: Obada Khalili <54270856+obadakhalili@users.noreply.github.com >
Co-authored-by: Nam Vu <zuzoovn@gmail.com >
Co-authored-by: Kei YAMAZAKI <1715090+kei-yamazaki@users.noreply.github.com >
Co-authored-by: TechnoHouse <13776377+deephbz@users.noreply.github.com >
Co-authored-by: Riddhimaan-Senapati <114703025+Riddhimaan-Senapati@users.noreply.github.com >
Co-authored-by: MaFee921 <31881301+2284730142@users.noreply.github.com >
Co-authored-by: te-chan <t-nakanome@sakura-is.co.jp >
Co-authored-by: HQidea <HQidea@users.noreply.github.com >
Co-authored-by: Joshbly <36315710+Joshbly@users.noreply.github.com >
Co-authored-by: xhe <xw897002528@gmail.com >
Co-authored-by: weiwenyan-dev <154779315+weiwenyan-dev@users.noreply.github.com >
Co-authored-by: ex_wenyan.wei <ex_wenyan.wei@tcl.com >
Co-authored-by: engchina <12236799+engchina@users.noreply.github.com >
Co-authored-by: engchina <atjapan2015@gmail.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: 呆萌闷油瓶 <253605712@qq.com >
Co-authored-by: Kemal <kemalmeler@outlook.com >
Co-authored-by: Lazy_Frog <4590648+lazyFrogLOL@users.noreply.github.com >
Co-authored-by: Yi Xiao <54782454+YIXIAO0@users.noreply.github.com >
Co-authored-by: Steven sun <98230804+Tuyohai@users.noreply.github.com >
Co-authored-by: steven <sunzwj@digitalchina.com >
Co-authored-by: Kalo Chin <91766386+fdb02983rhy@users.noreply.github.com >
Co-authored-by: Katy Tao <34019945+KatyTao@users.noreply.github.com >
Co-authored-by: depy <42985524+h4ckdepy@users.noreply.github.com >
Co-authored-by: 胡春东 <gycm520@gmail.com >
Co-authored-by: Junjie.M <118170653@qq.com >
Co-authored-by: MuYu <mr.muzea@gmail.com >
Co-authored-by: Naoki Takashima <39912547+takatea@users.noreply.github.com >
Co-authored-by: Summer-Gu <37869445+gubinjie@users.noreply.github.com >
Co-authored-by: Fei He <droxer.he@gmail.com >
Co-authored-by: ybalbert001 <120714773+ybalbert001@users.noreply.github.com >
Co-authored-by: Yuanbo Li <ybalbert@amazon.com >
Co-authored-by: douxc <7553076+douxc@users.noreply.github.com >
Co-authored-by: liuzhenghua <1090179900@qq.com >
Co-authored-by: Wu Jiayang <62842862+Wu-Jiayang@users.noreply.github.com >
Co-authored-by: Your Name <you@example.com >
Co-authored-by: kimjion <45935338+kimjion@users.noreply.github.com >
Co-authored-by: AugNSo <song.tiankai@icloud.com >
Co-authored-by: llinvokerl <38915183+llinvokerl@users.noreply.github.com >
Co-authored-by: liusurong.lsr <liusurong.lsr@alibaba-inc.com >
Co-authored-by: Vasu Negi <vasu-negi@users.noreply.github.com >
Co-authored-by: Hundredwz <1808096180@qq.com >
Co-authored-by: Xiyuan Chen <52963600+GareArc@users.noreply.github.com >
2025-02-17 17:05:13 +08:00
Novice
f0b9257387
fix: error in obtaining end_to_node_id during conditional parallel execution ( #13673 )
2025-02-13 18:00:28 +08:00
Novice
c00e7d3f65
fix: retry log running error ( #13472 )
...
Co-authored-by: Novice Lee <novicelee@NoviPro.local >
2025-02-11 15:48:55 +08:00
Lazy_Frog
b7c11c1818
Fix the problem of Workflow terminates after parallel tasks execution, merge node not triggered ( #12498 )
...
Co-authored-by: Novice Lee <novicelee@NoviPro.local >
2025-02-07 13:56:08 +08:00
