jyong
d4aed3df5c
Merge branch 'feat/queue-based-graph-engine' into feat/rag-2
...
# Conflicts:
# api/core/memory/token_buffer_memory.py
# api/core/rag/extractor/notion_extractor.py
# api/core/repositories/sqlalchemy_workflow_node_execution_repository.py
# api/core/variables/variables.py
# api/core/workflow/graph/graph.py
# api/core/workflow/graph_engine/entities/event.py
# api/services/dataset_service.py
# web/app/components/app-sidebar/index.tsx
# web/app/components/base/tag-management/selector.tsx
# web/app/components/base/toast/index.tsx
# web/app/components/datasets/create/website/index.tsx
# web/app/components/datasets/create/website/jina-reader/base/options-wrap.tsx
# web/app/components/workflow/header/version-history-button.tsx
# web/app/components/workflow/hooks/use-inspect-vars-crud-common.ts
# web/app/components/workflow/hooks/use-workflow-interactions.ts
# web/app/components/workflow/panel/version-history-panel/index.tsx
# web/service/base.ts
2025-09-03 15:01:06 +08:00
-LAN-
0b0dc63f29
Merge remote-tracking branch 'origin/main' into feat/queue-based-graph-engine
2025-09-02 11:52:25 +08:00
Novice
ca96350707
chore: optimize SQL queries that perform partial full table scans ( #24786 )
2025-09-02 11:46:11 +08:00
QuantumGhost
e9e7d4f3cd
Merge branch 'feat/rag-2' into feat/workflow-draft-var-optimize
2025-08-31 15:17:23 +08:00
QuantumGhost
2fd337e610
feat(api): add WorkflowNodeExecutionOffload model
2025-08-31 13:44:39 +08:00
QuantumGhost
de08b2310c
feat(api): Introduce WorkflowDraftVariableFile model
...
This model is used to track offloaded variables values for
`WorkflowDraftVariable`.
2025-08-31 13:44:38 +08:00
jyong
1db04aa729
Merge branch 'feat/queue-based-graph-engine' into feat/rag-2
2025-08-28 18:12:49 +08:00
-LAN-
c3f66e2901
Merge remote-tracking branch 'origin/main' into feat/queue-based-graph-engine
2025-08-27 18:05:35 +08:00
Yongtao Huang
2a29c61041
Refactor: replace count() > 0 check with exists() ( #24583 )
...
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-27 17:46:52 +08:00
jyong
392514fa13
Merge branch 'feat/queue-based-graph-engine' into feat/rag-2
...
# Conflicts:
# api/commands.py
# api/core/app/apps/common/workflow_response_converter.py
# api/core/llm_generator/llm_generator.py
# api/core/plugin/entities/plugin.py
# api/core/plugin/impl/tool.py
# api/core/rag/index_processor/index_processor_base.py
# api/core/workflow/entities/workflow_execution.py
# api/core/workflow/entities/workflow_node_execution.py
# api/core/workflow/enums.py
# api/core/workflow/graph_engine/entities/graph.py
# api/core/workflow/graph_engine/graph_engine.py
# api/core/workflow/nodes/enums.py
# api/services/dataset_service.py
2025-08-27 16:05:59 +08:00
-LAN-
8c35663220
feat: queue-based graph engine
...
Signed-off-by: -LAN- <laipz8200@outlook.com>
2025-08-27 15:33:28 +08:00
twwu
da48e54778
Merge branch 'main' into feat/rag-2
2025-08-27 11:16:27 +08:00
Yongtao Huang
fa753239ad
Refactor: use logger = logging.getLogger(__name__) in logging ( #24515 )
...
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>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
2025-08-26 18:10:31 +08:00
twwu
8c44151e6f
Merge branch 'main' into feat/rag-2
2025-08-22 17:40:34 +08:00
Eric Guo
455f842785
Flask 3.1.2 upgrade fix by Avoids using current_user in background thread ( #24290 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-08-22 14:47:13 +08:00
twwu
386614951f
Merge branch 'main' into feat/rag-2
2025-08-18 11:16:18 +08:00
-LAN-
e340fccafb
feat: integrate flask-orjson for improved JSON serialization performance ( #23935 )
2025-08-14 19:50:59 +08:00
twwu
40f3524cfe
Merge branch 'main' into feat/rag-2
2025-08-06 14:23:51 +08:00
rouxiaomin
40a11b6942
feat(api):Enhance the scope of expired data cleanup table in the Dify… ( #23414 )
2025-08-05 19:57:43 +08:00
zxhlyh
201e4cd64d
merge main
2025-08-05 10:30:53 +08:00
Asuka Minato
58608f51da
replace db with sa to get typing support ( #23240 )
2025-08-02 23:54:23 +08:00
Asuka Minato
79ea94483e
refine some orm types ( #22885 )
2025-07-31 18:43:04 +08:00
zxhlyh
a95cf6f8b0
merge main
2025-07-28 16:00:38 +08:00
Yongtao Huang
1c05491f1c
Chore: remove duplicate TYPE_CHECKING import ( #23013 )
...
Signed-off-by: Yongtao Huang <yongtaoh2022@gmail.com>
2025-07-28 10:04:45 +08:00
twwu
bae2af0c85
Merge branch main into feat/rag-2
2025-07-24 17:40:04 +08:00
Asuka Minato
ef51678c73
orm filter -> where ( #22801 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: Claude <noreply@anthropic.com>
2025-07-24 00:57:45 +08:00
zxhlyh
4d36e784b7
merge main
2025-07-21 17:45:26 +08:00
Aryan Raj
ce794335e9
Fix/replace datetime patterns with naive utc now ( #22654 )
2025-07-20 11:05:53 +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
e2a141b3bb
Merge branch 'main' into feat/rag-2
2025-07-10 10:14:12 +08:00
-LAN-
4cb50f1809
feat(libs): Introduce `extract_tenant_id` ( #22086 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com>
2025-07-09 17:45:56 +08:00
jyong
81b07dc3be
r2
2025-07-02 18:15:23 +08:00
jyong
efccbe4039
r2
2025-06-25 17:32:26 +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
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
-LAN-
6b1ad634f1
fix(workflow_run): sequence_number race. ( #21228 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com>
2025-06-19 17:53:49 +08:00
jyong
1d8b390584
Merge branch 'main' into feat/r2
...
# Conflicts:
# docker/docker-compose.middleware.yaml
2025-06-11 17:16:27 +08:00
QuantumGhost
930c4cb609
feat(api): Adjust `WorkflowDraftVariable` and `WorkflowNodeExecutionModel` ( #20746 )
...
- Add `node_execution_id` column to `WorkflowDraftVariable`, allowing efficient implementation of
the "Reset to last run value" feature.
- Add additional index for `WorkflowNodeExecutionModel` to improve the performance of last run lookup.
Closes #20745 .
2025-06-06 21:03:59 +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-
2ebf4e767b
fix(models): WorkflowRun's total_steps and exceptions_count mismatch with database ( #20452 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com>
2025-05-30 07:53:13 +08:00
-LAN-
f7fb10635f
refactor(workflow): Rename workflow node execution models ( #20458 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com>
2025-05-30 04:56:37 +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-
b357eca307
fix: Copy request context and current user in app generators. ( #20240 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com>
2025-05-27 10:56:23 +08:00
jyong
35be8721b9
Merge branch 'main' into feat/r2
2025-05-26 14:50:33 +08:00
jyong
64d997fdb0
r2
2025-05-23 15:55:41 +08:00
jyong
b93d26ee9f
Merge remote-tracking branch 'origin/feat/r2' into feat/r2
...
# Conflicts:
# api/core/datasource/entities/datasource_entities.py
2025-05-23 00:06:51 +08:00
jyong
b82b26bba5
r2
2025-05-23 00:05:57 +08:00