7947b7976b
feat: 1.12.1初步合并
...
Merge upstream release cd03e0a
2026-02-09 09:51:18 +08:00
90fe9abab7
revert: revert human input relevant code ( #31766 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-01-30 19:18:49 +08:00
03e3acfc71
feat(api): Human Input Node (backend part) ( #31646 )
...
The backend part of the human in the loop (HITL) feature and relevant architecture / workflow engine changes.
Signed-off-by: yihong0618 <zouzou0208@gmail.com >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: -LAN- <laipz8200@outlook.com >
Co-authored-by: 盐粒 Yanli <yanli@dify.ai >
Co-authored-by: CrabSAMA <40541269+CrabSAMA@users.noreply.github.com >
Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com >
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
Co-authored-by: yihong <zouzou0208@gmail.com >
Co-authored-by: Joel <iamjoel007@gmail.com >
2026-01-30 10:18:49 +08:00
3bcfb4031a
refactor: ExporleBanner to TypeBase ( #31698 )
2026-01-29 15:34:14 +09:00
b2f5707676
Merge 升级到1.11.4
...
# Conflicts:
# .github/workflows/tool-test-sdks.yaml
# api/.env.example
# api/README.md
# api/commands.py
# api/controllers/console/explore/wraps.py
# api/controllers/web/workflow.py
# api/extensions/ext_commands.py
# api/models/model.py
# api/pyproject.toml
# api/services/feature_service.py
# web/README.md
# web/app/components/explore/app-card/index.tsx
# web/app/components/explore/app-list/index.tsx
# web/app/components/explore/sidebar/index.tsx
# web/app/signin/components/mail-and-password-auth.tsx
# web/i18n/uk-UA/app-overview.json
# web/i18n/uk-UA/app.json
# web/i18n/uk-UA/billing.json
# web/i18n/uk-UA/common.json
# web/i18n/uk-UA/dataset-creation.json
# web/i18n/uk-UA/dataset-documents.json
# web/i18n/uk-UA/dataset-hit-testing.json
# web/i18n/uk-UA/dataset-settings.json
# web/i18n/uk-UA/dataset.json
# web/i18n/uk-UA/explore.json
# web/i18n/uk-UA/plugin.json
# web/i18n/uk-UA/tools.json
# web/next.config.js
# web/package.json
# web/pnpm-lock.yaml
# web/service/common.ts
# web/service/explore.ts
# web/service/fetch.ts
# web/service/use-explore.ts
# web/types/feature.ts
2026-01-26 07:08:40 +08:00
5c4028d557
refactor: port AppModelConfig ( #30919 )
...
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
2026-01-24 10:25:51 +08:00
8284f9c3c8
fix: web app
2026-01-23 18:33:15 +08:00
515002a8ba
feat: app trial ( #26281 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: hj24 <mambahj24@gmail.com >
2026-01-22 15:42:54 +08:00
9ed0d7c891
fix: 上下文，聊天计费，额度
2026-01-21 18:10:18 +08:00
6452c5a7ac
refactor(db): enforce non-null message annotation questions ( #27915 )
2026-01-21 17:54:59 +08:00
84d6d2840b
feat: 合并更新到1.11.2
2026-01-15 18:02:46 +08:00
52af829f1f
refactor: enhance clean messages task ( #29638 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: 非法操作 <hjlarry@163.com >
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
2026-01-15 14:03:17 +08:00
d3923e7b56
refactor: port AppAnnotationHitHistory ( #30922 )
...
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
2026-01-15 10:14:55 +08:00
2f633de45e
refactor: port TenantCreditPool ( #30926 )
...
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>
2026-01-15 10:14:15 +08:00
1e10bf525c
refactor(models): Refine MessageAgentThought SQLAlchemy typing ( #27749 )
...
Co-authored-by: Asuka Minato <i@asukaminato.eu.org >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-01-10 17:17:45 +09:00
fe0802262c
feat: credit pool ( #30720 )
...
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>
2026-01-08 13:17:30 +08:00
4f0fb6df2b
chore: use from __future__ import annotations ( #30254 )
...
Co-authored-by: Dev <dev@Devs-MacBook-Pro-4.local >
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 >
2026-01-06 23:57:20 +09:00
f57aa08a3f
fix: flask db check fails due to nullable mismatch between migrations and models ( #30474 )
...
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com >
Co-authored-by: Maries <xh001x@hotmail.com >
2026-01-06 20:23:59 +08:00
eccf79a710
chore: remove unused link icon type ( #30469 )
2026-01-06 10:10:06 +08:00
a99ac3fe0d
refactor(models): Add mapped type hints to MessageAnnotation ( #27751 )
2026-01-05 15:50:03 +08:00
61ee1b9094
fix: truncate auto-populated description to prevent 400-char limit error ( #28681 )
2025-12-12 11:19:53 +08:00
6e802a343e
perf: remove the n+1 query ( #29483 )
2025-12-11 15:18:27 +08:00
2e1efd62e1
revert: "fix(ops): add streaming metrics and LLM span for agent-chat traces" ( #29469 )
2025-12-11 12:53:37 +08:00
51330c0ee6
fix(App.deleted_tools): incorrect compare between UUID and map with string-typed key. ( #29340 )
...
Co-authored-by: 01393547 <nieronghua@sf-express.com >
Co-authored-by: Yeuoly <45712896+Yeuoly@users.noreply.github.com >
2025-12-10 10:47:45 +08:00
38522e5dfa
fix: use default_factory for callable defaults in ORM dataclasses ( #28730 )
2025-11-27 09:39:49 +09:00
1e23957657
fix(ops): add streaming metrics and LLM span for agent-chat traces ( #28320 )
...
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-11-26 22:45:20 +08:00
751ce4ec41
more typed orm ( #28577 )
...
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-11-24 21:01:46 +08:00
6241b87f90
more typed orm ( #28519 )
...
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-11-24 10:50:20 +08:00
a6c6bcf95c
more typed orm ( #28507 )
2025-11-21 21:45:51 +08:00
237bb4595b
more typed orm ( #28494 )
...
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-11-21 16:42:27 +09:00
c0b7ffd5d0
feat:mysql adaptation for metadb ( #28188 )
2025-11-20 09:44:39 +08:00
7994144df7
add onupdate=func.current_timestamp() ( #28014 )
...
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-11-10 01:48:52 +09:00
3c23375607
refactor: Use Repository Pattern for Model Layer ( #27663 )
2025-11-04 09:53:22 +08:00
eaa02e3d55
Add SQLAlchemy Mapped annotations to MessageFeedback ( #27768 )
2025-11-04 09:39:59 +08:00
4461df1bd9
refactor(api): add SQLAlchemy 2.x Mapped type hints to Message model ( #27709 )
...
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
2025-11-01 01:16:07 +08:00
32c715c4d0
rm type ignore ( #25715 )
...
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: -LAN- <laipz8200@outlook.com >
2025-10-21 11:26:58 +08:00
19cc6ea993
fix 27003 ( #27005 )
...
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>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-10-17 09:10:16 +08:00
7065b67d07
add app mode for message ( #26876 )
2025-10-16 10:19:49 +08:00
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
f26fe2f4d2
Merge tag '1.8.1' into merge-tag-1.8.1
...
# Conflicts:
# .gitignore
# README.md
# api/.env.example
# api/Dockerfile
# api/commands.py
# api/configs/app_config.py
# api/controllers/console/__init__.py
# api/controllers/console/apikey.py
# api/controllers/console/app/statistic.py
# api/controllers/service_api/app/app.py
# api/controllers/service_api/app/audio.py
# api/controllers/service_api/app/completion.py
# api/controllers/service_api/app/conversation.py
# api/controllers/service_api/app/file.py
# api/controllers/service_api/app/message.py
# api/controllers/service_api/app/workflow.py
# api/controllers/service_api/wraps.py
# api/controllers/web/completion.py
# api/core/app/apps/advanced_chat/app_generator.py
# api/core/app/apps/advanced_chat/generate_task_pipeline.py
# api/core/app/apps/agent_chat/app_generator.py
# api/core/app/apps/workflow/app_generator.py
# api/core/app/apps/workflow/generate_task_pipeline.py
# api/core/app/task_pipeline/workflow_cycle_manage.py
# api/core/helper/code_executor/code_executor.py
# api/core/tools/builtin_tool/providers/code/tools/simple_code.py
# api/core/workflow/nodes/code/code_node.py
# api/docker/entrypoint.sh
# api/events/event_handlers/__init__.py
# api/extensions/ext_celery.py
# api/extensions/ext_commands.py
# api/models/model.py
# api/models/workflow.py
# api/poetry.lock
# api/pyproject.toml
# api/services/app_service.py
# api/services/feature_service.py
# api/services/workspace_service.py
# web/.env.example
# web/Dockerfile
# web/app/(commonLayout)/apps/Apps.tsx
# web/app/components/apps/app-card.tsx
# web/app/components/base/chat/embedded-chatbot/index.tsx
# web/app/components/base/mermaid/index.tsx
# web/app/components/develop/index.tsx
# web/app/components/develop/secret-key/secret-key-modal.tsx
# web/app/components/develop/secret-key/style.module.css
# web/app/components/develop/template/template.zh.mdx
# web/app/components/explore/app-list/index.tsx
# web/app/components/explore/category.tsx
# web/app/components/explore/sidebar/index.tsx
# web/app/components/header/account-dropdown/index.tsx
# web/app/components/header/index.tsx
# web/app/components/share/utils.ts
# web/app/layout.tsx
# web/app/signin/components/mail-and-password-auth.tsx
# web/app/signin/normal-form.tsx
# web/app/signin/page.module.css
# web/context/app-context.tsx
# web/i18n/i18next-config.ts
# web/i18n/ja-JP/login.ts
# web/i18n/ko-KR/login.ts
#
if dify_config.WORKFLOW_LOG_CLEANUP_ENABLED:
# 2:00 AM every day
imports.append("schedule.clean_workflow_runlogs_precise")
beat_schedule["clean_workflow_runlogs_precise"] = {
"task": "schedule.clean_workflow_runlogs_precise.clean_workflow_runlogs_precise",
"schedule": crontab(minute="0", hour="2"),
} web/package.json
# web/pnpm-lock.yaml
# web/types/feature.ts
2025-09-25 15:55:13 +08:00
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
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
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
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
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
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
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
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
a78339a040
remove bare list, dict, Sequence, None, Any ( #25058 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: -LAN- <laipz8200@outlook.com >
2025-09-06 03:32:23 +08:00
d2ec7a3dd8
chore: change the oauth_provider_apps table to uuidV7 ( #24792 )
2025-08-29 17:54:14 +08:00
npc0-hue