7947b7976b
feat: 1.12.1初步合并
...
Merge upstream release cd03e0a
2026-02-09 09:51:18 +08:00
920db69ef2
refactor: if to match ( #31799 )
2026-02-02 18:12:03 +09:00
9ed0d7c891
fix: 上下文，聊天计费，额度
2026-01-21 18:10:18 +08:00
84d6d2840b
feat: 合并更新到1.11.2
2026-01-15 18:02:46 +08:00
91667e3c1d
feat(api): Implement EventManager error logging and add coverage ( #29204 )
...
- Ensure `EventManager._notify_layers` logs exceptions instead of silently swallowing them
so GraphEngine layer failures surface for debugging
- Introduce unit tests to assert the logger captures the runtime error when collecting events
- Enable the `S110` lint rule to catch `try-except-pass` patterns
- Add proper error logging for existing `try-except-pass` blocks.
2025-12-08 09:40:40 +08:00
4b969bdce3
fix:mysql does not support 'returning' ( #29069 )
2025-12-04 10:14:19 +08:00
b76e17b25d
feat: introduce trigger functionality ( #27644 )
...
Signed-off-by: lyzno1 <yuanyouhuilyz@gmail.com >
Co-authored-by: Stream <Stream_2@qq.com >
Co-authored-by: lyzno1 <92089059+lyzno1@users.noreply.github.com >
Co-authored-by: zhsama <torvalds@linux.do >
Co-authored-by: Harry <xh001x@hotmail.com >
Co-authored-by: lyzno1 <yuanyouhuilyz@gmail.com >
Co-authored-by: yessenia <yessenia.contact@gmail.com >
Co-authored-by: hjlarry <hjlarry@163.com >
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: WTW0313 <twwu@dify.ai >
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-11-12 17:59:37 +08:00
87fb9a6b69
fix Version 2.0.0-beta.2: Chat annotations Api Error #25506 ( #27206 )
...
Co-authored-by: crazywoola <100913391+crazywoola@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: Asuka Minato <i@asukaminato.eu.org >
2025-11-05 17:37:19 +08:00
2abbc14703
refactor: replace hardcoded user plan strings with CloudPlan enum ( #27675 )
2025-11-03 11:51:09 +08:00
17832f2424
fix: Dify 1.8.1问题修复
...
本次提交整合了多个功能改进和问题修复：
主要功能：
- 批量工作流处理功能完善，支持 Excel 上传和进度跟踪
- 管理中心反向代理和转发配置优化
- 用户同步添加互斥锁，防止并发问题
- 计费系统和额度显示优化
- AI 绘图功能扩展
前端改进：
- 文本生成应用显示修复
- 批量任务进度展示优化
- 按钮样式和 CSS 优化，禁止换行
- 多语言支持完善（新增印尼语等）
- 构建镜像逻辑优化
- 批量处理进度管理器实现
后端改进：
- Docker Compose 配置升级
- 队列任务和 Worker Pool 优化
- Admin API 初始化和验证逻辑改进
- 数据库迁移和初始化完善
- 静态变量处理优化
- URL 签名助手实现
- Celery 扩展优化
- 代码和导入包问题修复（idea 自动调整代码位置）
技术改进：
- 兼容性修复 (flask-restx, jschardet)
- 钉钉 Web API 版本更新
- 代码格式化和导入包问题修复
- 日志处理优化
- 工作流循环管理优化
Docker 相关：
- Nginx 配置更新
- 容器启动脚本优化
- 镜像构建流程改进
- docker-compose.dify-plus.yaml 大幅更新
管理后台：
- 工作流批量处理 API 实现
- 工作池初始化
- 批量工作流服务实现
- 转发扩展配置
- 用户服务扩展
2025-10-17 23:04:25 +08:00
cced33d068
use deco to avoid current_user ( #26077 )
...
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-16 15:45:51 +09: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
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
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
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
38057b1b0e
add typing to all wraps ( #25405 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-09-09 16:48:33 +08:00
720ecea737
fix: tenant_id was not specific when retrieval end-user in plugin backwards invocation wraps ( #25377 )
...
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
2025-09-09 09:49:35 +08:00
4ee49f3550
chore: remove weird account login ( #22247 )
...
Co-authored-by: zhuqingchao <zhuqingchao@xiaomi.com >
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com >
2025-09-08 10:44:36 +08:00
f6059ef389
add more typing ( #24949 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-09-08 10:40:00 +08:00
99f57f5954
fix: EndUser is not bound to a Session ( #25010 )
2025-09-02 21:37:21 +08:00
d33dfee8a3
fix: EndUser is not bound to a Session ( #25010 )
2025-09-02 21:37:21 +08:00
2b2cd9fc9d
example enum to StrEnum ( #24877 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-09-01 15:40:26 +08:00
d41d4deaac
example enum to StrEnum ( #24877 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-09-01 15:40:26 +08:00
e91a9f8935
chore: cleanup unnecessary mypy suppressions on imports ( #24712 )
2025-08-28 23:17:25 +08:00
39064197da
chore: cleanup unnecessary mypy suppressions on imports ( #24712 )
2025-08-28 23:17:25 +08:00
a864ed1985
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
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
8b2d7fc78e
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
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
849f75d2c6
Fix/replace datetime patterns with naive utc now ( #22654 )
2025-07-20 11:05:53 +08:00
ce794335e9
Fix/replace datetime patterns with naive utc now ( #22654 )
2025-07-20 11:05:53 +08:00
554fa569df
Add get document detail service api ( #21700 )
...
Co-authored-by: lizb <lizb@sugon.com >
2025-06-30 22:13:56 +08:00
55a6b330ec
Add get document detail service api ( #21700 )
...
Co-authored-by: lizb <lizb@sugon.com >
2025-06-30 22:13:56 +08:00
526441d63f
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
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
5a3baa271f
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
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
d4fbeeda86
fix: 修正api调用出错
2025-04-16 10:43:56 +08:00
73e81323fc
合并dify1.2.0版本代码
...
# Conflicts:
# api/controllers/service_api/app/workflow.py
# api/controllers/service_api/wraps.py
# web/.env.example
# web/app/components/share/utils.ts
# web/app/signin/page.module.css
# web/context/debug-configuration.ts
2025-04-09 19:57:08 +08:00
eb8584613b
fix: Account.query => db.session.query(Account) ( #17667 )
2025-04-09 14:07:32 +08:00
fd443941a2
feat(improve-api-endpoints): Added Datasets and Annotation APIs ( #12237 )
2025-04-07 10:36:58 +08:00
81dbfd6748
feat: 合并dify1.1.3版本
...
# Conflicts:
# README.md
# api/.env.example
# api/controllers/console/__init__.py
# api/controllers/console/apikey.py
# api/controllers/console/explore/completion.py
# api/controllers/console/explore/workflow.py
# api/controllers/service_api/app/workflow.py
# api/controllers/service_api/wraps.py
# api/controllers/web/workflow.py
# api/core/model_runtime/model_providers/bedrock/get_bedrock_client.py
# api/core/model_runtime/model_providers/bedrock/llm/llm.py
# api/core/model_runtime/model_providers/openai_api_compatible/openai_api_compatible.yaml
# api/core/model_runtime/model_providers/openai_api_compatible/text_embedding/text_embedding.py
# api/models/model.py
# api/poetry.lock
# api/pyproject.toml
# web/.env.example
# web/Dockerfile
# web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout.tsx
# web/app/components/app/overview/appCard.tsx
# web/app/components/base/chat/chat-with-history/chat-wrapper.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/explore/app-list/index.tsx
# web/app/components/explore/item-operation/index.tsx
# web/app/components/explore/sidebar/app-nav-item/index.tsx
# web/app/components/explore/sidebar/index.tsx
# web/app/components/header/account-setting/index.tsx
# web/app/components/header/index.tsx
# web/app/components/share/text-generation/index.tsx
# web/app/components/tools/provider/detail.tsx
# web/app/layout.tsx
# web/package.json
# web/service/base.ts
# web/yarn.lock
2025-03-28 16:35:13 +08:00
b5aa970766
feat: 新增sandbox-full支持
2025-03-28 15:18:33 +08:00
9b2a9260ef
Feat/new saas billing ( #14996 )
2025-03-10 19:50:11 +08:00
9a417bfc5e
fix: update database query and model definitions ( #14415 )
2025-02-26 18:45:12 +08:00
05a0faff6a
fix: app token's last_used_at can't be updated when last_used_at is null ( #12770 )
2025-01-22 11:01:45 +08:00
9a6b1dc3a1
Revert "Feat/new saas billing" ( #12673 )
2025-01-13 15:17:43 +08:00
4e101604c3
fix: ruff check for True if ... else ( #12576 )
...
Signed-off-by: yihong0618 <zouzou0208@gmail.com >
2025-01-13 09:38:48 +08:00
npc0-hue