jyong
2f1c47406c
Merge branch 'feat/rag-2' into feat/add-dataset-service-api-enable
...
# Conflicts:
# api/controllers/console/datasets/datasets.py
# api/controllers/service_api/wraps.py
# api/services/dataset_service.py
2025-09-16 15:21:23 +08:00
QuantumGhost
dd34002db2
Merge remote-tracking branch 'upstream/main' into feat/rag-2
2025-09-16 14:59:35 +08:00
jyong
c4ddc6420a
fix document retry
2025-09-16 14:18:26 +08:00
-LAN-
08dd3f7b50
Fix basedpyright type errors ( #25435 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-09-10 01:54:26 +08:00
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
jyong
617dc247f5
fix preview and recommend plugins
2025-09-03 12:15:03 +08:00
Charles Liu
f7ac1192ae
replace the secret field from obfuscated to full-masked value ( #24800 )
...
Co-authored-by: charles liu <dearcharles.liu@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-09-02 09:19:20 +08:00
jyong
d94e03c72b
add recommended rag plugin endpoint
2025-09-01 19:38:28 +08:00
QuantumGhost
e9e7d4f3cd
Merge branch 'feat/rag-2' into feat/workflow-draft-var-optimize
2025-08-31 15:17:23 +08:00
QuantumGhost
6b9d2e98b9
feat(api): Implement truncation for WorkflowNodeExecution
2025-08-31 13:44:39 +08:00
twwu
da48e54778
Merge branch 'main' into feat/rag-2
2025-08-27 11:16:27 +08:00
湛露先生
13d3271ec0
code cleans ,and add exception message. ( #24536 )
...
Signed-off-by: zhanluxianshen <zhanluxianshen@163.com>
2025-08-26 14:52:11 +08:00
jyong
101d6504fb
fix
2025-08-25 16:14:22 +08:00
twwu
85fd97e090
Merge branch 'main' into feat/rag-2
2025-08-25 15:30:18 +08:00
-LAN-
b7466f8b65
feat: API docs for service api ( #24425 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com>
2025-08-25 09:26:54 +08:00
Matri Qi
f31ddc4b1c
fix(api): restful to restx migration issue ( #24416 )
2025-08-24 20:58:42 +08:00
Asuka Minato
18dce66443
try flask_restful -> flask_restx ( #24310 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
2025-08-24 13:45:47 +08:00
zxhlyh
201e4cd64d
merge main
2025-08-05 10:30:53 +08:00
NeatGuyCoding
a724f35672
fix: fetchAppWithTags may return empty when apps is over 100 ( #23350 )
2025-08-04 20:20:43 +08:00
zxhlyh
01566035e3
merge main
2025-07-17 16:48:43 +08:00
qfl
bdb9f29948
feat(app): support custom max_active_requests per app ( #22073 )
2025-07-16 15:31:19 +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
Novice
535fff62f3
feat: add MCP support ( #20716 )
...
Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com>
2025-07-10 14:01:34 +08:00
twwu
9e44f2b805
Merge branch 'main' into feat/rag-2
2025-07-09 15:54:57 +08:00
Minamiyama
3643ed1014
Feat: description field for env variables ( #21556 )
2025-07-09 15:18:23 +08:00
jyong
618ad4c291
r2
2025-06-30 15:36:20 +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
-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
1d2ee9020c
r2
2025-06-17 14:04:55 +08:00
jyong
e934503fa0
r2
2025-06-10 18:16:30 +08:00
jyong
e7c48c0b69
r2
2025-05-29 23:04:04 +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
Good Wood
6f982eb7e4
feat: add author_name for app list card ( #16900 )
...
Co-authored-by: crazywoola <427733928@qq.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
2025-05-26 18:20:53 +08:00
jyong
82be119fec
Merge branch 'main' into feat/r2
2025-05-20 15:18:52 +08:00
jyong
ba52bf27c1
r2
2025-05-20 14:57:26 +08:00
NFish
d186daa131
E-300 ( #19726 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: Hash Brown <hi@xzd.me>
Co-authored-by: crazywoola <427733928@qq.com>
Co-authored-by: GareArc <chen4851@purdue.edu>
Co-authored-by: Byron.wang <byron@dify.ai>
Co-authored-by: Joel <iamjoel007@gmail.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: Garfield Dai <dai.hai@foxmail.com>
Co-authored-by: KVOJJJin <jzongcode@gmail.com>
Co-authored-by: Alexi.F <654973939@qq.com>
Co-authored-by: Xiyuan Chen <52963600+GareArc@users.noreply.github.com>
Co-authored-by: kautsar_masuara <61046989+izon-masuara@users.noreply.github.com>
Co-authored-by: achmad-kautsar <achmad.kautsar@insignia.co.id>
Co-authored-by: Xin Zhang <sjhpzx@gmail.com>
Co-authored-by: kelvintsim <83445753+kelvintsim@users.noreply.github.com>
Co-authored-by: zxhlyh <jasonapring2015@outlook.com>
Co-authored-by: Zixuan Cheng <61724187+Theysua@users.noreply.github.com>
2025-05-20 12:07:50 +08:00
jyong
8bea88c8cc
r2
2025-05-16 17:22:17 +08:00
jyong
4ff971c8a3
r2
2025-05-16 11:26:56 +08:00
jyong
360f8a3375
Merge branch 'main' into feat/r2
2025-05-15 15:15:23 +08:00
jyong
818eb46a8b
r2
2025-05-15 15:14:52 +08:00
Bowen Liang
8537abfff8
chore: avoid repeated type ignore noqa by adding flask_restful and flask_login in mypy import exclusions ( #19224 )
2025-05-06 11:58:49 +08:00
Yeuoly
c2d02f8f4d
Merge branch 'main' into feat/r2
2025-04-27 14:31:19 +08:00
Alex Chim
12836f9db9
Resolves #18536 Retreive conversation variables ( #18581 )
2025-04-25 11:52:25 +08:00
Dongyu Li
413271eaa6
feat[plugin]:The plugin upload file change to be stored as a toolfile… ( #18277 )
2025-04-22 13:05:42 +08:00
jyong
5c4bf2a9e4
r2
2025-04-17 15:07:23 +08:00
Jimmyy
aead48726e
fix: cannot regenerate with image( #15060 ) ( #16611 )
...
Co-authored-by: werido <359066432@qq.com>
2025-04-16 09:56:46 +08:00
LiuBodong
ae5d2ecf48
fix:weight_type missing when create document in dataset ( #16503 )
2025-03-22 20:21:57 +08:00
Jyong
abeaea4f79
Support knowledge metadata filter ( #15982 )
2025-03-18 16:42:19 +08:00